summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-09 00:47:47 (GMT)
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-02 17:17:55 (GMT)
commitcba2737caeb5a72a36717c2f5813b19a1d4b1a01 (patch)
treee8fbcfdba2640687af17014b0e43a7a9fe141ff1 /core
parent6eb79cd0a4768a58fb2fbee12170e21cf9ab4883 (diff)
downloadbuild-cba2737caeb5a72a36717c2f5813b19a1d4b1a01.zip
build-cba2737caeb5a72a36717c2f5813b19a1d4b1a01.tar.gz
build-cba2737caeb5a72a36717c2f5813b19a1d4b1a01.tar.bz2
keep up with latest manifest merger in Debian
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'core')
-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