diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-03-17 17:03:22 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-03-17 17:03:22 +0100 |
| commit | 76a5e0bd1abc19d9d5664a59b9602bb24e15c259 (patch) | |
| tree | 42a9b9f84266af85e276e89bf83acb62cab2ac7a /core | |
| parent | 1a97c05380da59a44cb47336456ea9855b187910 (diff) | |
| download | build-76a5e0bd1abc19d9d5664a59b9602bb24e15c259.zip build-76a5e0bd1abc19d9d5664a59b9602bb24e15c259.tar.gz build-76a5e0bd1abc19d9d5664a59b9602bb24e15c259.tar.bz2 | |
Use java -jar ... instead of java -cp ...
When running Jack or Jill.
Change-Id: I2127f183f8f033a9d35a7e8247a9432252a58bc8
Diffstat (limited to 'core')
| -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 6e7c697..00d4406 100644 --- a/core/config.mk +++ b/core/config.mk @@ -436,7 +436,7 @@ endif # $(1): vm arguments # $(2): jack perf arguments 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 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS) ifneq ($(ANDROID_JACK_VM_ARGS),) @@ -452,7 +452,7 @@ endif # Redirect jack warnings to stdout. 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 JAVATAGS := build/tools/java-event-log-tags.py LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX) |