diff options
| author | Ying Wang <wangying@google.com> | 2015-01-22 00:13:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-22 00:13:33 +0000 |
| commit | 0f205ad959005514d5fad98ba14a1b3db84e173e (patch) | |
| tree | 707d06cf1519fa998f05d192fb1eda5b2108cd1d /core/package_internal.mk | |
| parent | b6af64c3ea37ccffef63feed08547d5732b7c824 (diff) | |
| parent | 29a29875627758aa3c76aa5256641c1782c904bf (diff) | |
| download | build-0f205ad959005514d5fad98ba14a1b3db84e173e.zip build-0f205ad959005514d5fad98ba14a1b3db84e173e.tar.gz build-0f205ad959005514d5fad98ba14a1b3db84e173e.tar.bz2 | |
am 29a29875: Merge "Running jarjar on Java resources."
* commit '29a29875627758aa3c76aa5256641c1782c904bf':
Running jarjar on Java resources.
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index a6ad354..e16c68f 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -320,7 +320,12 @@ 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 @@ -381,7 +386,9 @@ endif endif $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest) @echo "target Package: $(PRIVATE_MODULE) ($@)" - $(create-empty-package) + $(if $(PRIVATE_SOURCE_ARCHIVE),\ + $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@),\ + $(create-empty-package)) $(add-assets-to-package) ifneq ($(jni_shared_libraries),) $(add-jni-shared-libs-to-package) @@ -389,10 +396,6 @@ 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) ifdef LOCAL_DEX_PREOPT ifneq (nostripping,$(LOCAL_DEX_PREOPT)) |