summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-09 01:47:47 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-09 01:47:47 +0100
commit34b65b9553c9395846ae1bbe186be2667139db79 (patch)
tree894476f40fd3630f93f147034b9c534a326b8b9f
parent7b76723375405e200d1e6c5767eab62a7013716a (diff)
downloadbuild-34b65b9553c9395846ae1bbe186be2667139db79.zip
build-34b65b9553c9395846ae1bbe186be2667139db79.tar.gz
build-34b65b9553c9395846ae1bbe186be2667139db79.tar.bz2
keep up with latest manifest merger in Debian
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--core/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk
index facf37c..d1a0464 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 /usr/share/java/com.android.tools.build.manifest-merger.jar:/usr/share/java/com.android.tools.common.jar:/usr/share/java/androidsdk-sdklib.jar com.android.manifmerger.Main merge
+ANDROID_MANIFEST_MERGER := java -classpath /usr/share/java/com.android.tools.build.manifest-merger.jar:/usr/share/java/com.android.tools.common.jar:/usr/share/java/androidsdk-sdklib.jar:/usr/share/java/com.android.tools.sdk-common.jar com.android.manifmerger.Merger
YACC_HEADER_SUFFIX:= .hpp