diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-21 11:04:22 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-01-21 11:04:22 +0000 |
| commit | c1ed9796bb14cb6257b3550caac107abc7b1aa79 (patch) | |
| tree | ae0d287089e4efc8ca4d84ca66399949fdc9cfa5 /core/dpi_specific_apk.mk | |
| parent | 140274707e31c9585aa28b0de2f1418c64ecd272 (diff) | |
| download | build-c1ed9796bb14cb6257b3550caac107abc7b1aa79.zip build-c1ed9796bb14cb6257b3550caac107abc7b1aa79.tar.gz build-c1ed9796bb14cb6257b3550caac107abc7b1aa79.tar.bz2 | |
Revert "Running jarjar on Java resources."
This reverts commit 140274707e31c9585aa28b0de2f1418c64ecd272.
Breaks the build on uiautomator_compat.
Change-Id: I6d14f39e3432bf5e691027bbb8e7260e4bec8e8d
Diffstat (limited to 'core/dpi_specific_apk.mk')
| -rw-r--r-- | core/dpi_specific_apk.mk | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/core/dpi_specific_apk.mk b/core/dpi_specific_apk.mk index 11c7c84..aad4713 100644 --- a/core/dpi_specific_apk.mk +++ b/core/dpi_specific_apk.mk @@ -25,31 +25,24 @@ $(built_dpi_apk): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME $(built_dpi_apk): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_INSTRUMENTATION_FOR) $(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis) $(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis) +$(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex) +# Note that PRIVATE_CLASS_INTERMEDIATES_DIR points to the base apk's intermediate dir. +$(built_dpi_apk): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates)/classes +$(built_dpi_apk): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args) $(built_dpi_apk): PRIVATE_PRIVATE_KEY := $(private_key) $(built_dpi_apk): PRIVATE_CERTIFICATE := $(certificate) $(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\ $(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8) -ifneq ($(full_classes_jar),) -$(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex) -# Use the jarjar processed arhive as the initial package file. -$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar) -$(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. $(built_dpi_apk) : $(R_file_stamp) $(built_dpi_apk) : $(all_library_res_package_export_deps) +$(built_dpi_apk) : $(built_dex) $(built_dpi_apk) : $(private_key) $(certificate) $(SIGNAPK_JAR) $(built_dpi_apk) : $(AAPT) | $(ZIPALIGN) $(built_dpi_apk) : $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest) @echo "target Package: $(PRIVATE_MODULE) ($@)" - $(if $(PRIVATE_SOURCE_ARCHIVE),\ - $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@),\ - $(create-empty-package)) + $(create-empty-package) $(add-assets-to-package) ifneq ($(jni_shared_libraries),) $(add-jni-shared-libs-to-package) @@ -57,6 +50,10 @@ endif ifneq ($(full_classes_jar),) $(add-dex-to-package) endif + $(add-carried-java-resources) +ifneq ($(extra_jar_args),) + $(add-java-resources-to-package) +endif $(sign-package) $(align-package) |