commit 8998d57404b73bf4df059542df4dc52631db45c9
author Yohann Roussel <yroussel@google.com> Fri Jul 03 15:46:51 2015 +0200
committer Yohann Roussel <yroussel@google.com> Wed Oct 21 17:22:05 2015 +0200
tree ee33729b2b925b2729e0cf13f81e895bdb41036f
parent b2c5558435b6628b6500be9f197269f95a89c983

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

core/configure_local_jack.mk

diff --git a/core/configure_local_jack.mk b/core/configure_local_jack.mk
index 98b13d2..d903ed9 100644
--- a/core/configure_local_jack.mk
+++ b/core/configure_local_jack.mk
@@ -17,7 +17,9 @@
 ifdef ANDROID_FORCE_JACK_ENABLED
 LOCAL_JACK_ENABLED := $(ANDROID_FORCE_JACK_ENABLED)
 endif
+
 LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED))
+
 ifneq ($(LOCAL_JACK_ENABLED),full)
 ifneq ($(LOCAL_JACK_ENABLED),incremental)
 ifdef LOCAL_JACK_ENABLED
@@ -28,3 +30,9 @@
 LOCAL_JACK_ENABLED :=
 endif
 endif
+
+ifdef $(LOCAL_MODULE).JACK_VERSION
+LOCAL_JACK_VERSION := $($(LOCAL_MODULE).JACK_VERSION)
+else
+LOCAL_JACK_VERSION := $(JACK_DEFAULT_VERSION)
+endif