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/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/java_library.mk')
| -rw-r--r-- | core/java_library.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java_library.mk b/core/java_library.mk index 8641aad..5ba8267 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -69,13 +69,13 @@ $(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar) $(common_javalib.jar): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS) $(common_javalib.jar) : $(built_dex) $(java_resource_sources) @echo "target Jar: $(PRIVATE_MODULE) ($@)" -ifeq ($(LOCAL_USE_JACK),true) +ifdef LOCAL_JACK_ENABLED $(create-empty-package) else $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@) endif $(add-dex-to-package) -ifeq ($(LOCAL_USE_JACK),true) +ifdef LOCAL_JACK_ENABLED $(add-carried-jack-resources) endif |