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/java_library.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/java_library.mk')
| -rw-r--r-- | core/java_library.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/java_library.mk b/core/java_library.mk index 586172b..0930234 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -58,6 +58,9 @@ $(common_javalib.jar) : $(full_classes_jar) endif @echo "target Static Jar: $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) +ifneq ($(extra_jar_args),) + $(add-java-resources-to-package) +endif $(LOCAL_BUILT_MODULE): $(common_javalib.jar) $(copy-file-to-target) @@ -65,18 +68,18 @@ $(LOCAL_BUILT_MODULE): $(common_javalib.jar) else # !LOCAL_IS_STATIC_JAVA_LIBRARY $(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex) -$(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar) $(common_javalib.jar) : $(built_dex) $(java_resource_sources) @echo "target Jar: $(PRIVATE_MODULE) ($@)" -ifeq ($(LOCAL_USE_JACK),true) $(create-empty-package) -else - $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@) -endif $(add-dex-to-package) -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 ifdef LOCAL_DEX_PREOPT ifneq ($(dexpreopt_boot_jar_module),) # boot jar |