diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-02-18 14:35:01 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-02-19 00:03:57 +0100 |
| commit | 06744f60fc48d0a33bd538497e77b624adee7d75 (patch) | |
| tree | 4d344c5c4800a32c9cb20a67eeb06e29a4d68f22 | |
| parent | f5ccd7b2434bc4d3bb1202ed18e89cf94ceaff9d (diff) | |
| download | build-06744f60fc48d0a33bd538497e77b624adee7d75.tar.gz build-06744f60fc48d0a33bd538497e77b624adee7d75.tar.bz2 build-06744f60fc48d0a33bd538497e77b624adee7d75.zip | |
Package dpi specific resources when Jack is enabled
Change-Id: I75995305359fe3870df61e67ba22c8d259342bf9
| -rw-r--r-- | core/dpi_specific_apk.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/dpi_specific_apk.mk b/core/dpi_specific_apk.mk index a05380fac..379074493 100644 --- a/core/dpi_specific_apk.mk +++ b/core/dpi_specific_apk.mk @@ -30,14 +30,18 @@ $(built_dpi_apk): PRIVATE_CERTIFICATE := $(certificate) $(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\ $(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8) +$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := ifneq ($(full_classes_jar),) $(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex) +ifndef LOCAL_JACK_ENABLED # Use the jarjar processed arhive as the initial package file. $(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar) +else +$(built_dpi_apk): PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc +endif # LOCAL_JACK_ENABLED $(built_dpi_apk): $(built_dex) else $(built_dpi_apk): PRIVATE_DEX_FILE := -$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := endif # full_classes_jar # Set up dependenncies and the build recipe. @@ -56,6 +60,9 @@ ifneq ($(jni_shared_libraries),) endif ifneq ($(full_classes_jar),) $(add-dex-to-package) +ifdef LOCAL_JACK_ENABLED + $(add-carried-jack-resources) +endif endif $(sign-package) $(align-package) |