diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-11 16:32:11 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-11 16:32:11 +0100 |
| commit | 35c9421f7a5b4a3a67b0a7b76e68bf83b4bef546 (patch) | |
| tree | f2468c3b5316899c49cccb67e177b188a774bd45 /core/config.mk | |
| parent | 1f8a26cd2a5289039c52f15cba382c614d4fc6d3 (diff) | |
| download | build-35c9421f7a5b4a3a67b0a7b76e68bf83b4bef546.zip build-35c9421f7a5b4a3a67b0a7b76e68bf83b4bef546.tar.gz build-35c9421f7a5b4a3a67b0a7b76e68bf83b4bef546.tar.bz2 | |
use manifest merger from /usr
It's now available in Debian Stretch
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk index d596a68..528c286 100644 --- a/core/config.mk +++ b/core/config.mk @@ -516,7 +516,7 @@ FINDBUGS := /usr/bin/findbugs EMMA_JAR := /usr/share/java/emma$(COMMON_JAVA_PACKAGE_SUFFIX) # Tool to merge AndroidManifest.xmls -ANDROID_MANIFEST_MERGER := java -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge +ANDROID_MANIFEST_MERGER := java -classpath /usr/share/java/com.android.tools.build.manifest-merger.jar com.android.manifmerger.Main merge YACC_HEADER_SUFFIX:= .hpp |