summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-11 15:32:11 (GMT)
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-02 17:17:54 (GMT)
commit9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05 (patch)
tree82058d045c3a83046d0c710a7de4dac27577d779
parent2167eef3bafee588e07e822e9bd8945669e2d802 (diff)
downloadbuild-9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05.zip
build-9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05.tar.gz
build-9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05.tar.bz2
use manifest merger from /usr
It's now available in Debian Stretch
-rw-r--r--core/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk
index c4b05c8..a6065a7 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -518,7 +518,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