tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: Ib8cc3b9c920ac0fbe0001416aca16624b7f7b19c
This commit is contained in:
Treehugger Robot 2020-08-06 21:43:37 +00:00 committed by Automerger Merge Worker
commit 2997e42efa
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/board/BoardConfigGsiCommon.mk
View file

@ -33,20 +33,14 @@ BOARD_USES_METADATA_PARTITION := true
# updating the last seen rollback index in the tamper-evident storage. # updating the last seen rollback index in the tamper-evident storage.
BOARD_AVB_ROLLBACK_INDEX := 0 BOARD_AVB_ROLLBACK_INDEX := 0
ifndef BUILDING_GSI
# Enable AVB chained partition for system. # Enable AVB chained partition for system.
# https://android.googlesource.com/platform/external/avb/+/master/README.md # https://android.googlesource.com/platform/external/avb/+/master/README.md
BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
else ifdef BUILDING_GSI
# Enable vbmeta_system on GSI targets # super.img spec for GSI targets
BOARD_AVB_VBMETA_SYSTEM := system
BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
BOARD_SUPER_PARTITION_SIZE := 3229614080 BOARD_SUPER_PARTITION_SIZE := 3229614080
BOARD_SUPER_PARTITION_GROUPS := gsi_dynamic_partitions BOARD_SUPER_PARTITION_GROUPS := gsi_dynamic_partitions
BOARD_GSI_DYNAMIC_PARTITIONS_PARTITION_LIST := system BOARD_GSI_DYNAMIC_PARTITIONS_PARTITION_LIST := system