From 35c9421f7a5b4a3a67b0a7b76e68bf83b4bef546 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Sun, 11 Dec 2016 16:32:11 +0100 Subject: use manifest merger from /usr It's now available in Debian Stretch --- core/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.1