summaryrefslogtreecommitdiffstats
path: root/core/config.mk
diff options
context:
space:
mode:
Diffstat (limited to 'core/config.mk')
-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