tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I2ee3b84f4edf4af08821c8feece944cc84c62fb1
This commit is contained in:
Jaewoong Jung 2021-05-14 15:18:26 +00:00 committed by Automerger Merge Worker
commit b8781f9670
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/app_prebuilt_internal.mk
View file

@ -183,6 +183,30 @@ $(built_module) : $(LOCAL_REPLACE_PREBUILT_APK_INSTALLED)
$(transform-prebuilt-to-target)
else # ! LOCAL_REPLACE_PREBUILT_APK_INSTALLED
# If the SDK version is 30 or higher, the apk is signed with a v2+ scheme.
# Altering it will invalidate the signature. Just do error checks instead.
do_not_alter_apk :=
ifeq (PRESIGNED,$(LOCAL_CERTIFICATE))
ifneq (,$(LOCAL_SDK_VERSION))
ifeq ($(call math_is_number,$(LOCAL_SDK_VERSION)),true)
ifeq ($(call math_gt,$(LOCAL_SDK_VERSION),29),true)
do_not_alter_apk := true
endif
endif
# TODO: Add system_current after fixing the existing modules.
ifneq ($(filter current test_current core_current,$(LOCAL_SDK_VERSION)),)
do_not_alter_apk := true
endif
endif
endif
ifeq ($(do_not_alter_apk),true)
$(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN)
$(transform-prebuilt-to-target)
$(check-jni-dex-compression)
$(check-package-alignment)
else
# Sign and align non-presigned .apks.
# The embedded prebuilt jni to uncompress.
ifeq ($(LOCAL_CERTIFICATE),PRESIGNED)
@ -229,6 +253,7 @@ endif # LOCAL_CERTIFICATE
ifdef LOCAL_COMPRESSED_MODULE
$(compress-package)
endif # LOCAL_COMPRESSED_MODULE
endif # ! do_not_alter_apk
endif # ! LOCAL_REPLACE_PREBUILT_APK_INSTALLED

18
core/definitions.mk
View file

@ -2380,6 +2380,15 @@ $(hide) if ! $(ZIPALIGN) -c -p 4 $@ >/dev/null ; then \
fi
endef
# Verifies ZIP alignment of a package.
#
define check-package-alignment
$(hide) if ! $(ZIPALIGN) -c -p 4 $@ >/dev/null ; then \
$(call echo-error,$@,Improper package alignment); \
exit 1; \
fi
endef
# Compress a package using the standard gzip algorithm.
define compress-package
$(hide) \
@ -2448,6 +2457,15 @@ define uncompress-prebuilt-embedded-jni-libs
fi
endef
# Verifies shared JNI libraries and dex files in an apk are uncompressed.
#
define check-jni-dex-compression
if (zipinfo $@ 'lib/*.so' '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then \
$(call echo-error,$@,Contains compressed JNI libraries and/or dex files); \
exit 1; \
fi
endef
# Remove unwanted shared JNI libraries embedded in an apk.
#
define remove-unwanted-prebuilt-embedded-jni-libs