diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-02-05 11:01:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 11:01:22 +0000 |
| commit | 9d528c778b32300f9f19cd9ef57bd79f5458e0ae (patch) | |
| tree | b9c0b1d6bb0f0fa3ab452ccdd1b48e878d781a8d /core/base_rules.mk | |
| parent | 4283c36732bdad865ab4192521bc973501a4248f (diff) | |
| parent | 37822c443d3d2ba88dd009c994f088906a0f5568 (diff) | |
| download | build-9d528c778b32300f9f19cd9ef57bd79f5458e0ae.zip build-9d528c778b32300f9f19cd9ef57bd79f5458e0ae.tar.gz build-9d528c778b32300f9f19cd9ef57bd79f5458e0ae.tar.bz2 | |
Merge "Engage Jack incremental on demand"
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 7355c30..f33ebf1 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 |