From 39764125a46aadd270d3f7299bdefa0638dc3195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= Date: Tue, 18 Apr 2023 11:25:52 +0100 Subject: [PATCH 1/2] gs101: Cover pvmfw.img in vbmeta_system.img The pvmfw partition is expected to be kept in sync with the system partition so, instead of having it as a standalone partition (covered by vbmeta.img), add it to vbmeta_system. Bug: 275497314 Test: TH Change-Id: I03f10699859ec8079ef2e2e4177f6cfa7f83d6d6 --- BoardConfig-common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index fa3d102e..9be8d92f 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -133,6 +133,10 @@ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 +ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false) +BOARD_AVB_VBMETA_SYSTEM += pvmfw +endif + # Enable chained vbmeta for boot images BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048 From 659e45659715926e1d9be7c049b83f07bb64f4c6 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 18 Apr 2023 19:50:36 +0800 Subject: [PATCH 2/2] gs101: update media_codecs_performance_c2.xml based on UP1A.230417.001 - add sw decoder performance measure result from DVT device Bug: 275148623 Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest Change-Id: Ib839a12585393dc1dd07ed4f71632603bcc9b74b --- media_codecs_performance_c2.xml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index d8f1f609..c25312be 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -152,16 +152,13 @@ - - - - - - - - - - + + + + + + + @@ -175,6 +172,12 @@ + + + + + +