From de6f4cfdc8c3bd2f1ae6bcb79023fb334f6c9d5a Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 4 Dec 2018 16:51:21 +0000 Subject: [PATCH] Reenable avb for mainline Partial rollback of Id5d114bde8b93800fe52c791ccc47cdffd86f382. It is likely mainline also wants some of the BOARD_AVB_SYSTEM.. flags, but I'm not entirely sure which ones. Test: run build_mixed with this patch Change-Id: I6ef3c01f6c74e6d93cf798b26b8c7a4785bbefb4 --- target/board/BoardConfigGsiCommon.mk | 7 ++----- target/board/BoardConfigMainlineCommon.mk | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index a52bb8045..73af0201a 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -18,15 +18,12 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 # Android Verified Boot (AVB): -# 1) Sets BOARD_AVB_ENABLE to sign the GSI image. -# 2) Sets AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in -# vbmeta.img to disable AVB verification. +# Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in +# vbmeta.img to disable AVB verification. # # To disable AVB for GSI, use the vbmeta.img and the GSI together. # To enable AVB for GSI, include the GSI public key into the device-specific # vbmeta.img. -BOARD_AVB_ENABLE := true -BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2 # Enable chain partition for system. diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index 1cbe2e0d6..ec3c74f81 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -23,3 +23,6 @@ BOARD_USES_SYSTEM_OTHER_ODEX := true # Audio: must using XML format for Treblized devices USE_XML_AUDIO_POLICY_CONF := 1 + +BOARD_AVB_ENABLE := true +BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)