diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-09 01:47:47 +0100 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-01-02 18:17:55 +0100 |
commit | cba2737caeb5a72a36717c2f5813b19a1d4b1a01 (patch) | |
tree | e8fbcfdba2640687af17014b0e43a7a9fe141ff1 | |
parent | 6eb79cd0a4768a58fb2fbee12170e21cf9ab4883 (diff) | |
download | build-cba2737caeb5a72a36717c2f5813b19a1d4b1a01.tar.gz build-cba2737caeb5a72a36717c2f5813b19a1d4b1a01.tar.bz2 build-cba2737caeb5a72a36717c2f5813b19a1d4b1a01.zip |
keep up with latest manifest merger in 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 facf37c3b..d1a046490 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:/usr/share/java/com.android.tools.common.jar:/usr/share/java/androidsdk-sdklib.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:/usr/share/java/com.android.tools.sdk-common.jar com.android.manifmerger.Merger YACC_HEADER_SUFFIX:= .hpp |