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/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/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 |