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/package_internal.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/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 059f121..898a8df 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -162,7 +162,7 @@ endif # need_compile_res endif # !custom LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS) -ifeq ($(LOCAL_USE_JACK),true) +ifeq ($(strip $(LOCAL_USE_JACK)),true) ifndef LOCAL_JACK_PROGUARD_FLAGS LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS) endif @@ -278,7 +278,7 @@ endif # they want to use this module's R.java file. $(LOCAL_BUILT_MODULE): $(R_file_stamp) -ifeq ($(LOCAL_USE_JACK),true) +ifeq ($(strip $(LOCAL_USE_JACK)),true) ifneq ($(built_dex_intermediate),) $(built_dex_intermediate): $(R_file_stamp) endif @@ -339,12 +339,7 @@ endif # LOCAL_NO_STANDARD_LIBRARIES ifneq ($(full_classes_jar),) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) -# Use the jarjar processed arhive as the initial package file. -$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar) $(LOCAL_BUILT_MODULE): $(built_dex) -else -$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := -$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := endif # full_classes_jar include $(BUILD_SYSTEM)/install_jni_libs.mk @@ -405,13 +400,7 @@ endif endif $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest) @echo "target Package: $(PRIVATE_MODULE) ($@)" -ifeq ($(LOCAL_USE_JACK),true) $(create-empty-package) -else - $(if $(PRIVATE_SOURCE_ARCHIVE),\ - $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@),\ - $(create-empty-package)) -endif $(add-assets-to-package) ifneq ($(jni_shared_libraries),) $(add-jni-shared-libs-to-package) @@ -419,9 +408,14 @@ endif ifneq ($(full_classes_jar),) $(add-dex-to-package) endif -ifeq ($(LOCAL_USE_JACK),true) +ifneq ($(strip $(LOCAL_USE_JACK)),true) + $(add-carried-java-resources) +else $(add-carried-jack-resources) endif +ifneq ($(extra_jar_args),) + $(add-java-resources-to-package) +endif $(sign-package) ifdef LOCAL_DEX_PREOPT ifneq (nostripping,$(LOCAL_DEX_PREOPT)) |