Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de6f4cfd authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent ed9baf88

target/board/BoardConfigGsiCommon.mk

+2 −5
Original line number Diff line number Diff line
@@ -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

#   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.

target/board/BoardConfigMainlineCommon.mk

+3 −0
Original line number Diff line number Diff line
@@ -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)