diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-11 17:48:06 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-01-02 18:17:54 +0100 |
| commit | 67b2035363c3e1b70e139c6de54da27720b499b9 (patch) | |
| tree | 51f0584276a8bc27ac67c5dcb98520a0342c08ce | |
| parent | 9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05 (diff) | |
| download | build-67b2035363c3e1b70e139c6de54da27720b499b9.tar.gz build-67b2035363c3e1b70e139c6de54da27720b499b9.tar.bz2 build-67b2035363c3e1b70e139c6de54da27720b499b9.zip | |
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.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk index a6065a7e4..facf37c3b 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 |