commit 77cbe10fd9c27747f98825f4923a0cfc65b28faf
author Yohann Roussel <yroussel@google.com> Tue Apr 14 18:38:11 2015 +0200
committer Yohann Roussel <yroussel@google.com> Wed Apr 15 12:29:01 2015 +0200
tree 4d5c2f1f296d1a02a3ad81fd66d0b21e0d81d90c
parent cbdd2c348f875739be778178087f60a01040b50e

Use Jack launcher

Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index cbe1227..3c8297d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -377,6 +377,7 @@
 # Generic tools.
 JACK := $(HOST_OUT_EXECUTABLES)/jack
 JACK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack.jar
+JACK_LAUNCHER_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack-launcher.jar
 JILL_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jill.jar
 JACK_MULTIDEX_DEFAULT_PREPROCESSOR := frameworks/multidex/library/resources/JACK-INF/legacyMultidexInstallation.jpp
 
@@ -441,7 +442,7 @@
 JACK_SERVER_LOG_COMMAND := mkdir -p $(DIST_DIR)/logs/; SERVER_LOG=$(DIST_DIR)/logs/jack-server.log
 endif
 define call-jack
-$(JACK_SERVER_LOG_COMMAND) JACK_VM_COMMAND="$(JACK_VM) $(1) $(JAVA_TMPDIR_ARG)" JACK_JAR="$(JACK_JAR)" $(JACK) $(2)
+$(JACK_SERVER_LOG_COMMAND) JACK_VM_COMMAND="$(JACK_VM) $(1) $(JAVA_TMPDIR_ARG) -jar $(JACK_LAUNCHER_JAR) " JACK_JAR="$(JACK_JAR)" $(JACK) $(2)
 endef
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
 ifneq ($(ANDROID_JACK_VM_ARGS),)