diff options
| author | Ying Wang <wangying@google.com> | 2015-04-15 14:39:26 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-04-15 14:39:26 -0700 |
| commit | 87a21c8b893bab839d0052db2297e10bc2bc82e3 (patch) | |
| tree | 2587a7ce12498a18ef2095493f279965e177a021 | |
| parent | 599b07a4b24444be1c07db4d98b7af7848951936 (diff) | |
| parent | eec386a4df21c58403f6b959247689307f99a91e (diff) | |
| download | build-87a21c8b893bab839d0052db2297e10bc2bc82e3.zip build-87a21c8b893bab839d0052db2297e10bc2bc82e3.tar.gz build-87a21c8b893bab839d0052db2297e10bc2bc82e3.tar.bz2 | |
resolved conflicts for merge of eec386a4 to master
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
| -rw-r--r-- | core/package_internal.mk | 2 | ||||
| -rw-r--r-- | core/prebuilt_internal.mk | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 4dbb1ac..ecc2a95 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -432,12 +432,12 @@ endif ifdef LOCAL_JACK_ENABLED $(add-carried-jack-resources) endif - $(sign-package) ifdef LOCAL_DEX_PREOPT ifneq (nostripping,$(LOCAL_DEX_PREOPT)) $(call dexpreopt-remove-classes.dex,$@) endif endif + $(sign-package) @# Alignment must happen after all other zip operations. $(align-package) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 5e9f5ab..40474de 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -193,17 +193,18 @@ include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk $(built_module) : PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES) $(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) $(transform-prebuilt-to-target) +ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) + @# Only strip out files if we can re-sign the package. ifdef extracted_jni_libs $(hide) zip -d $@ 'lib/*.so' # strip embedded JNI libraries. endif -ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) - $(sign-package) -endif ifdef LOCAL_DEX_PREOPT ifneq (nostripping,$(LOCAL_DEX_PREOPT)) $(call dexpreopt-remove-classes.dex,$@) endif endif + $(sign-package) +endif $(align-package) ############################### |