diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-11 17:48:06 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-11 17:48:06 +0100 |
| commit | 6662a629cef6f9bcf7edf0885080e3857b8b49b5 (patch) | |
| tree | b2dd18cad18ce5a9a3974fda527b22c1749512e7 | |
| parent | 35c9421f7a5b4a3a67b0a7b76e68bf83b4bef546 (diff) | |
| download | build-6662a629cef6f9bcf7edf0885080e3857b8b49b5.zip build-6662a629cef6f9bcf7edf0885080e3857b8b49b5.tar.gz build-6662a629cef6f9bcf7edf0885080e3857b8b49b5.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.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk index 528c286..f6a1458 100644 --- a/core/config.mk +++ b/core/config.mk @@ -516,7 +516,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 |