From 81f39298671e9d1885076f9d2c3e401ef3a5715b Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Thu, 30 Jul 2020 22:12:14 +0800 Subject: [PATCH] Remove vbmeta_system from GSI targets This partially reverts commit 1785816ca1cfeaf2ce602e0b704ea5ba262144e3 so that the hash tree at the end of GSI is properly signed by AVB. Bug: 161503491 Test: 'm dist' and check that vbmeta_system.im is gone Test: boot GSI on android10 CF Test: 'avbtool info_image --image system.img' and check AVB signing Change-Id: I9f488380c0c410fdbd02c3c0803b6dc06cf7faab --- target/board/BoardConfigGsiCommon.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index d0aeb1c717..9d55f42af5 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -33,20 +33,14 @@ BOARD_USES_METADATA_PARTITION := true # updating the last seen rollback index in the tamper-evident storage. BOARD_AVB_ROLLBACK_INDEX := 0 -ifndef BUILDING_GSI # Enable AVB chained partition for system. # https://android.googlesource.com/platform/external/avb/+/master/README.md BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 -else -# Enable vbmeta_system on GSI targets -BOARD_AVB_VBMETA_SYSTEM := system -BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem -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 +ifdef BUILDING_GSI +# super.img spec for GSI targets BOARD_SUPER_PARTITION_SIZE := 3229614080 BOARD_SUPER_PARTITION_GROUPS := gsi_dynamic_partitions BOARD_GSI_DYNAMIC_PARTITIONS_PARTITION_LIST := system