diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-25 03:10:52 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-25 03:10:52 +0100 |
| commit | bfea7b7ab54da80259a5c09453938c35804a9240 (patch) | |
| tree | 05dc37637d17ef60b74645de2f9cf82d23f43a8e /core/config.mk | |
| parent | dd96a6f2073354c2823517b21f10685332cfc08c (diff) | |
| download | build-bfea7b7ab54da80259a5c09453938c35804a9240.zip build-bfea7b7ab54da80259a5c09453938c35804a9240.tar.gz build-bfea7b7ab54da80259a5c09453938c35804a9240.tar.bz2 | |
proguard and emma.jar from GNU/Linux host
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'core/config.mk')
| -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 4897be6..d596a68 100644 --- a/core/config.mk +++ b/core/config.mk @@ -489,7 +489,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) @@ -513,7 +513,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 |