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

Commit 42d33f65 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Automerger Merge Worker
Browse files

Merge "Enable vbmeta_system for GSI targets" am: 6fa0dd9b am: 38267e14 am:... 

Merge "Enable vbmeta_system for GSI targets" am: 6fa0dd9b am: 38267e14 am: 9ca864f8 am: ba5617cf am: e5560b42

Original change: https://android-review.googlesource.com/c/platform/build/+/1359124

Change-Id: I988a14843b853a7dcb587a01644267357ed87a6c
parents 794c556e e5560b42

target/board/BoardConfigGsiCommon.mk

+15 −2
Original line number Diff line number Diff line
@@ -33,12 +33,25 @@ BOARD_USES_METADATA_PARTITION := true 
#   updating the last seen rollback index in the tamper-evident storage.

BOARD_AVB_ROLLBACK_INDEX := 0



# Enable chain partition for system.

# GSI need to sign on system.img instead of vbmeta.

ifndef BUILDING_GSI

# Enable AVB chained partition for system.

# 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_ALGORITHM := SHA256_RSA2048

BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)

BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1

else

# Enable vbmeta_system on 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_GROUPS := gsi_dynamic_partitions

BOARD_GSI_DYNAMIC_PARTITIONS_PARTITION_LIST := system

BOARD_GSI_DYNAMIC_PARTITIONS_SIZE := 3221225472

endif



# Enable chain partition for boot, mainly for GKI images.

BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem

target/board/generic/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ TARGET_CPU_ABI := armeabi-v7a 
TARGET_CPU_ABI2 := armeabi



include build/make/target/board/BoardConfigGsiCommon.mk



ifndef BUILDING_GSI

include build/make/target/board/BoardConfigEmuCommon.mk



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
@@ -44,3 +46,4 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X 
WIFI_DRIVER_FW_PATH_PARAM   := "/dev/null"

WIFI_DRIVER_FW_PATH_STA     := "/dev/null"

WIFI_DRIVER_FW_PATH_AP      := "/dev/null"

endif

target/board/generic_x86/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ TARGET_ARCH_VARIANT := x86 
TARGET_PRELINK_MODULE := false



include build/make/target/board/BoardConfigGsiCommon.mk

ifndef BUILDING_GSI

include build/make/target/board/BoardConfigEmuCommon.mk



# Resize to 4G to accomodate ASAN and CTS
@@ -38,3 +39,4 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X 
WIFI_DRIVER_FW_PATH_PARAM   := "/dev/null"

WIFI_DRIVER_FW_PATH_STA     := "/dev/null"

WIFI_DRIVER_FW_PATH_AP      := "/dev/null"

endif

target/board/generic_x86_64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ TARGET_2ND_ARCH_VARIANT := x86_64 


TARGET_PRELINK_MODULE := false

include build/make/target/board/BoardConfigGsiCommon.mk

ifndef BUILDING_GSI

include build/make/target/board/BoardConfigEmuCommon.mk



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
@@ -40,3 +41,4 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X 
WIFI_DRIVER_FW_PATH_PARAM   := "/dev/null"

WIFI_DRIVER_FW_PATH_STA     := "/dev/null"

WIFI_DRIVER_FW_PATH_AP      := "/dev/null"

endif

target/product/gsi_release.mk

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
# - etc.

#



BUILDING_GSI := true



# Exclude all files under system/product and system/system_ext

PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \

    system/product/% \