diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-11 16:32:11 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-01-02 18:17:54 +0100 |
| commit | 9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05 (patch) | |
| tree | 82058d045c3a83046d0c710a7de4dac27577d779 | |
| parent | 2167eef3bafee588e07e822e9bd8945669e2d802 (diff) | |
| download | build-9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05.tar.gz build-9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05.tar.bz2 build-9c2f9f073d58c3f4f87e20fc6983bbe05daf1b05.zip | |
use manifest merger from /usr
It's now available in Debian Stretch
| -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 c4b05c838..a6065a7e4 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 prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge +ANDROID_MANIFEST_MERGER := java -classpath /usr/share/java/com.android.tools.build.manifest-merger.jar com.android.manifmerger.Main merge YACC_HEADER_SUFFIX:= .hpp |