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_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_java_library.mk')
| -rw-r--r-- | core/host_dalvik_java_library.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 9b92df6..f5da638 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -98,7 +98,7 @@ $(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP) @echo Copying: $@ $(hide) $(ACP) -fp $< $@ -ifneq ($(LOCAL_USE_JACK),true) +ifndef LOCAL_JACK_ENABLED $(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON) $(built_dex): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) $(built_dex): $(full_classes_jar) $(DX) @@ -112,9 +112,17 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@) $(add-dex-to-package) -else # LOCAL_USE_JACK +else # LOCAL_JACK_ENABLED $(LOCAL_INTERMEDIATE_TARGETS): \ - PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jayces + PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc + +ifeq ($(LOCAL_JACK_ENABLED),incremental) +$(LOCAL_INTERMEDIATE_TARGETS): \ + PRIVATE_JACK_INCREMENTAL_DIR := $(intermediates.COMMON)/jack-incremental +else +$(LOCAL_INTERMEDIATE_TARGETS): \ + PRIVATE_JACK_INCREMENTAL_DIR := +endif $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_DEBUG_FLAGS := -g $(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack) @@ -134,7 +142,7 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) $(add-dex-to-package) $(add-carried-jack-resources) -endif # LOCAL_USE_JACK +endif # LOCAL_JACK_ENABLED USE_CORE_LIB_BOOTCLASSPATH := |