Merge "Removing --flag 2 when building GSI vbmeta.img" am: ab0ed975f0

am: 4b1e25af26

Change-Id: I0699a913794e3d80bbe7629f9a05b20360f771d8
This commit is contained in:
Bowgo Tsai 2019-04-30 01:39:09 -07:00 committed by android-build-merger
commit 50e9962a53

View file

@ -28,16 +28,9 @@ BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE :=
BOARD_USES_METADATA_PARTITION := true
# Android Verified Boot (AVB):
# Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flags 2) in
# vbmeta.img to disable AVB verification. Also set the rollback index
# to zero, to prevent the device bootloader from updating the last seen
# rollback index in the tamper-evident storage.
#
# 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.
# Set the rollback index to zero, to prevent the device bootloader from
# updating the last seen rollback index in the tamper-evident storage.
BOARD_AVB_ROLLBACK_INDEX := 0
BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
# Enable chain partition for system.
BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem