diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-25 03:10:52 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-01-02 18:17:05 +0100 |
| commit | b875c706ab040ce2ac46e79128d6484d1d9b75f9 (patch) | |
| tree | 33f71955749e903816e5272c5c48906a3ee9bba8 | |
| parent | ea3976637c5c97de46a0db0967fd3ddfae6ff197 (diff) | |
| download | build-b875c706ab040ce2ac46e79128d6484d1d9b75f9.tar.gz build-b875c706ab040ce2ac46e79128d6484d1d9b75f9.tar.bz2 build-b875c706ab040ce2ac46e79128d6484d1d9b75f9.zip | |
proguard and emma.jar from GNU/Linux host
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| -rw-r--r-- | core/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index dc7d8c406..c4b05c838 100644 --- a/core/config.mk +++ b/core/config.mk @@ -491,7 +491,7 @@ endif DEFAULT_JACK_EXTRA_ARGS += --verbose error JILL := java -Xmx3500m -jar $(JILL_JAR) -PROGUARD := external/proguard/bin/proguard.sh +PROGUARD := /usr/bin/proguard JAVATAGS := build/tools/java-event-log-tags.py LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX) BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat$(HOST_EXECUTABLE_SUFFIX) @@ -515,7 +515,7 @@ ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX) RELOCATION_PACKER := $(HOST_OUT_EXECUTABLES)/relocation_packer$(HOST_EXECUTABLE_SUFFIX) FINDBUGS := /usr/bin/findbugs -EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX) +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 |