From 705cd40b9525c617e00a5e70edc2eb12494e7d13 Mon Sep 17 00:00:00 2001 From: jizhenlo Date: Tue, 30 Apr 2024 14:42:52 +0800 Subject: [PATCH] Resign some APEX packages during the release build APEX packages currently are not resigned by a release key during the release build. Need to resign them to pass the CTS tests: testApexPubKeyIsNotWellKnownKey testPackageSignatures Test done: These two cts cases can pass with patch. Tracked-On: OAM-122509 Signed-off-by: jizhenlo --- tasks/flashfiles.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tasks/flashfiles.mk b/tasks/flashfiles.mk index e6b8684..297320c 100755 --- a/tasks/flashfiles.mk +++ b/tasks/flashfiles.mk @@ -20,12 +20,29 @@ BUILT_RELEASE_SUPER_IMAGE := $(PRODUCT_OUT)/release_sign/super.img endif SOONG_HOST_TOOL := \ PATH="$(SOONG_HOST_OUT)/bin:$$PATH" + +APEX_LIST := com.android.tethering.apex,\ + com.android.media.swcodec.apex,\ + com.android.ondevicepersonalization.apex,\ + com.android.scheduling.apex,\ + com.android.media.apex,\ + com.android.conscrypt.apex,\ + com.android.resolv.apex,\ + com.android.tzdata.apex,\ + com.android.btservices.apex,\ + com.android.sdkext.apex,\ + com.android.runtime.apex,\ + com.android.i18n.apex +BUILT_APEXS := $(subst $(space),,$(APEX_LIST)) + $(BUILT_RELEASE_TARGET_FILES_PACKAGE):$(BUILT_TARGET_FILES_PACKAGE) @echo "Package release: $@" $(SOONG_HOST_TOOL) \ $(HOST_OUT_EXECUTABLES)/sign_target_files_apks -o \ -d device/intel/build/testkeys/cts-release-test \ --key_mapping build/target/product/security/networkstack=device/intel/build/testkeys/cts-release-test/networkstack \ + --extra_apks $(BUILT_APEXS)=device/intel/build/testkeys/cts-release-test/apex \ + --extra_apex_payload_key $(BUILT_APEXS)=device/intel/build/testkeys/cts-release-test/apex.pem \ $(BUILT_TARGET_FILES_PACKAGE) $@ ifeq ($(SUPER_IMG_IN_FLASHZIP),true)