diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-01-09 10:36:40 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-02-04 11:22:26 +0100 |
| commit | 37822c443d3d2ba88dd009c994f088906a0f5568 (patch) | |
| tree | 67e0a1da8fb38a1cf909399dc9b55d3be1b066c9 /core/base_rules.mk | |
| parent | 2809666941aceea4af65ec6f9cea8cce1c1392ed (diff) | |
| download | build-37822c443d3d2ba88dd009c994f088906a0f5568.zip build-37822c443d3d2ba88dd009c994f088906a0f5568.tar.gz build-37822c443d3d2ba88dd009c994f088906a0f5568.tar.bz2 | |
Engage Jack incremental on demand
Each module may engage Jack incremental with
LOCAL_JACK_ENABLED := incremental
Include renaming of LOCAL_USE_JACK to LOCAL_JACK_ENABLED that is
now accepting 3 values "disabled", "full" and "incremental".
Change-Id: Icbff275b397bee36b29312e821f3e8d45f83fbcc
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index d0d0e11..6dcb7e7 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -43,6 +43,13 @@ endif my_module_tags := $(LOCAL_MODULE_TAGS) +LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED)) +ifneq ($(LOCAL_JACK_ENABLED),full) +ifneq ($(LOCAL_JACK_ENABLED),incremental) +LOCAL_JACK_ENABLED := +endif +endif + ########################################################### ## Validate and define fallbacks for input LOCAL_* variables. ########################################################### @@ -682,7 +689,7 @@ endif ########################################################### # JACK ########################################################### -ifeq ($(LOCAL_USE_JACK),true) +ifdef LOCAL_JACK_ENABLED ifdef need_compile_java full_static_jack_libs := \ @@ -757,7 +764,7 @@ endif # need_compile_java $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JACK_LIBRARIES:= $(full_jack_libs) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) -endif # LOCAL_USE_JACK +endif # LOCAL_JACK_ENABLED ########################################################### ## NOTICE files |