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

Commit dff3755a authored by Kenny Root's avatar Kenny Root
Browse files

Move package signing after file stripping 

For dex preopt and JNI library extraction, we should remove the
classes.dex and .so files before we sign the APK so that there
isn't an entry in the manifest.

Prebuilt APKs which are pre-signed will simply not have the files
removed. This may cause some system.img bloat, but signature checks make
this necessary.

Bug: 20247329
Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784
parent 8b75ec1c

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -402,12 +402,12 @@ ifeq ($(full_classes_jar),) 
else

	$(add-dex-to-package)

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)

core/prebuilt_internal.mk

+4 −3
Original line number Diff line number Diff line
@@ -193,16 +193,17 @@ 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)