From 67b2035363c3e1b70e139c6de54da27720b499b9 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Sun, 11 Dec 2016 17:48:06 +0100 Subject: add dependencies to manifest merger sdklib and tools.common are needed from Debian Signed-off-by: Wolfgang Wiedmeyer --- core/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.1