Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aa0223c authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs 

If a prebuilt APK contains shared libraries and the flag
LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true is set, then
uncompress any shared libraries stored within the APK.
This allows processes to load the shared library directly from
the APK.

Bug: 20247329
Bug: 8076853
Bug: 1162500
Change-Id: Iac4db32457d9ce31eb7256410023819b44fda0a6
parent b6874440

core/definitions.mk

+10 −0
Original line number Original line Diff line number Diff line
@@ -1944,6 +1944,16 @@ $(hide) $(ZIPALIGN) \ 
$(hide) mv $@.aligned $@

$(hide) mv $@.aligned $@

endef

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

define install-dex-debug

$(hide) if [ -f "$(PRIVATE_INTERMEDIATES_DIR)/classes.dex" ]; then \

$(hide) if [ -f "$(PRIVATE_INTERMEDIATES_DIR)/classes.dex" ]; then \

	    mkdir -p $(TOP)/dalvik/DEBUG-FILES; \

	    mkdir -p $(TOP)/dalvik/DEBUG-FILES; \

core/prebuilt_internal.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,9 @@ ifneq (nostripping,$(LOCAL_DEX_PREOPT)) 
endif

endif

endif

endif

	$(sign-package)

	$(sign-package)

endif

ifeq ($(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES),true)

	$(uncompress-shared-libs)

endif

endif

	$(align-package)

	$(align-package)