p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use java -jar ... instead of java -cp ... 

When running Jack or Jill.

Change-Id: I2127f183f8f033a9d35a7e8247a9432252a58bc8
This commit is contained in:
Yohann Roussel 2015-03-17 17:03:22 +01:00
parent 1a97c05380
commit 76a5e0bd1a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
View File

@ -436,7 +436,7 @@ endif
# $(1): vm arguments # $(1): vm arguments
# $(2): jack perf arguments # $(2): jack perf arguments
define call-jack define call-jack
$(JACK_VM) $(1) $(JAVA_TMPDIR_ARG) -cp $(JACK_JAR) com.android.jack.Main $(2) $(JACK_VM) $(1) $(JAVA_TMPDIR_ARG) -jar $(JACK_JAR) $(2)
endef endef
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
ifneq ($(ANDROID_JACK_VM_ARGS),) ifneq ($(ANDROID_JACK_VM_ARGS),)
@ -452,7 +452,7 @@ endif
# Redirect jack warnings to stdout. # Redirect jack warnings to stdout.
DEFAULT_JACK_EXTRA_ARGS += -D jack.reporter.level.file=error=--,warning=- DEFAULT_JACK_EXTRA_ARGS += -D jack.reporter.level.file=error=--,warning=-
JILL := java -Xmx3500m -cp $(JILL_JAR) com.android.jill.Main JILL := java -Xmx3500m -jar $(JILL_JAR)
PROGUARD := external/proguard/bin/proguard.sh PROGUARD := external/proguard/bin/proguard.sh
JAVATAGS := build/tools/java-event-log-tags.py JAVATAGS := build/tools/java-event-log-tags.py
LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX) LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)