commit b68c9a498d1e2c631eb6e8c9092d4d5775402083
author Yohann Roussel <yroussel@google.com> Fri Jul 03 15:46:51 2015 +0200
committer Yohann Roussel <yroussel@google.com> Wed Oct 14 11:32:45 2015 +0200
tree cb1d15e1d57e452755394ac5b3ded80862dac77e
parent 1ff557c21c5e23719b29af899059f326dc5bd372

Allow control of jack used for compilation

Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools

Bug: 24564814

Change-Id: Ie8120c97e0fa10953d4d015afd27aacfac80e5b6

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 2cf42cb..f9305df 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -644,6 +644,7 @@
 endif # LOCAL_PROGUARD_ENABLED defined
 
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS)
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)
 
 jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \
         $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) $(proguard_flag_files) \