StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reenable avb for mainline"

Browse Source 
am: 4a46570ff2

Change-Id: I2fce5d10bcb19479eddb2f771116d5ce877c3195
This commit is contained in:
Anton Hansson
2018-12-04 09:36:07 -08:00
committed by android-build-merger
parent 5d717bfb0f 4a46570ff2
commit 0127f7dd4f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target/board/BoardConfigGsiCommon.mk
View File

@@ -18,15 +18,12 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
# Android Verified Boot (AVB): # Android Verified Boot (AVB):
# 1) Sets BOARD_AVB_ENABLE to sign the GSI image. # Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in
# 2) Sets AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in # vbmeta.img to disable AVB verification.
# vbmeta.img to disable AVB verification.
# #
# To disable AVB for GSI, use the vbmeta.img and the GSI together. # 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 # To enable AVB for GSI, include the GSI public key into the device-specific
# vbmeta.img. # vbmeta.img.
BOARD_AVB_ENABLE := true
BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2
# Enable chain partition for system. # Enable chain partition for system.

3
target/board/BoardConfigMainlineCommon.mk
View File

@@ -23,3 +23,6 @@ BOARD_USES_SYSTEM_OTHER_ODEX := true
# Audio: must using XML format for Treblized devices # Audio: must using XML format for Treblized devices
USE_XML_AUDIO_POLICY_CONF := 1 USE_XML_AUDIO_POLICY_CONF := 1
BOARD_AVB_ENABLE := true
BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)