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/host_dalvik_static_java_library.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/host_dalvik_static_java_library.mk')
-rw-r--r-- | core/host_dalvik_static_java_library.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/host_dalvik_static_java_library.mk b/core/host_dalvik_static_java_library.mk index 6fe460e..bdce583 100644 --- a/core/host_dalvik_static_java_library.mk +++ b/core/host_dalvik_static_java_library.mk @@ -35,7 +35,14 @@ include $(BUILD_SYSTEM)/host_java_library.mk $(full_classes_jack): PRIVATE_JACK_FLAGS := $(LOCAL_JACK_FLAGS) $(full_classes_jack): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) $(full_classes_jack): \ - PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack + PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc +ifeq ($(LOCAL_JACK_ENABLED),incremental) +$(full_classes_jack): \ + PRIVATE_JACK_INCREMENTAL_DIR := $(intermediates.COMMON)/jack-incremental +else +$(full_classes_jack): \ + PRIVATE_JACK_INCREMENTAL_DIR := +endif $(full_classes_jack): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \ $(jar_manifest_file) $(layers_file) $(LOCAL_MODULE_MAKEFILE) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \ |