am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"

* commit '69b20474d578ea6313570c29526fc0854a920946':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
This commit is contained in:
Nick Kralevich 2015-04-18 00:48:37 +00:00 committed by Android Git Automerger
commit 700265cee2
2 changed files with 13 additions and 0 deletions

View File

@ -1944,6 +1944,16 @@ $(hide) $(ZIPALIGN) \
$(hide) mv $@.aligned $@
endef
define uncompress-shared-libs
$(hide) rm -rf $(dir $@)/tmpworkdir
$(hide) mv $@ $@.compressed
$(hide) mkdir $(dir $@)/tmpworkdir
$(hide) unzip $@.compressed 'lib/*.so' -d $(dir $@)/tmpworkdir
$(hide) ( cd $(dir $@)/tmpworkdir && zip -D -r -0 ../$(notdir $@).compressed lib )
$(hide) mv $@.compressed $@
$(hide) rm -rf $(dir $@)/tmpworkdir
endef
define install-dex-debug
$(hide) if [ -f "$(PRIVATE_INTERMEDIATES_DIR)/classes.dex" ]; then \
mkdir -p $(TOP)/dalvik/DEBUG-FILES; \

View File

@ -204,6 +204,9 @@ ifneq (nostripping,$(LOCAL_DEX_PREOPT))
endif
endif
$(sign-package)
endif
ifeq ($(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES),true)
$(uncompress-shared-libs)
endif
$(align-package)