diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-07-03 15:46:51 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-10-21 17:22:05 +0200 |
| commit | 8998d57404b73bf4df059542df4dc52631db45c9 (patch) | |
| tree | ee33729b2b925b2729e0cf13f81e895bdb41036f /core/java.mk | |
| parent | b2c5558435b6628b6500be9f197269f95a89c983 (diff) | |
| download | platform_build-8998d57404b73bf4df059542df4dc52631db45c9.tar.gz platform_build-8998d57404b73bf4df059542df4dc52631db45c9.tar.bz2 platform_build-8998d57404b73bf4df059542df4dc52631db45c9.zip | |
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
(cherry picked from commit b68c9a498d1e2c631eb6e8c9092d4d5775402083)
Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java.mk b/core/java.mk index 2cf42cb800..f9305df7ea 100644 --- a/core/java.mk +++ b/core/java.mk @@ -644,6 +644,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_PROGUARD_FLAGS := 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) \ |