diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-09 01:47:47 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-09 01:47:47 +0100 |
| commit | 34b65b9553c9395846ae1bbe186be2667139db79 (patch) | |
| tree | 894476f40fd3630f93f147034b9c534a326b8b9f | |
| parent | 7b76723375405e200d1e6c5767eab62a7013716a (diff) | |
| download | replicant_build-34b65b9553c9395846ae1bbe186be2667139db79.zip replicant_build-34b65b9553c9395846ae1bbe186be2667139db79.tar.gz replicant_build-34b65b9553c9395846ae1bbe186be2667139db79.tar.bz2 | |
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 facf37c..d1a0464 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 |