summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-11 16:48:06 (GMT)
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-02 17:17:54 (GMT)
commit67b2035363c3e1b70e139c6de54da27720b499b9 (patch)
tree51f0584276a8bc27ac67c5dcb98520a0342c08ce
parent9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05 (diff)
downloadbuild-67b2035363c3e1b70e139c6de54da27720b499b9.zip
build-67b2035363c3e1b70e139c6de54da27720b499b9.tar.gz
build-67b2035363c3e1b70e139c6de54da27720b499b9.tar.bz2
add dependencies to manifest merger
sdklib and tools.common are needed from 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 a6065a7..facf37c 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 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 com.android.manifmerger.Main merge
YACC_HEADER_SUFFIX:= .hpp