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

Commit 5c50562a authored Dec 04, 2018 by Anton Hansson Committed by android-build-merger Dec 04, 2018

Merge "Reenable avb for mainline" am: 4a46570f

am: 0127f7dd

Change-Id: Iab503123f0691cfcb3f4392283d5fb6fcd7dc38c

parents cbae9ed6 0127f7dd

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)