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/host_dalvik_static_java_library.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/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) \ |