Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev
am: 0d35d1a425
Change-Id: I9d0865299c34dd6997d08bb1a297ca6acda9ef8b
This commit is contained in:
commit
64dec58cc2
|
@ -59,6 +59,16 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml
|
|||
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
|
||||
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
|
||||
|
||||
# Android Verified Boot (AVB):
|
||||
# Builds a special vbmeta.img that disables AVB verification.
|
||||
# Otherwise, AVB will prevent the device from booting the generic system.img.
|
||||
# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
|
||||
# metadata into system.img.
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(error BOARD_AVB_ENABLE cannot be set for GSI)
|
||||
endif
|
||||
BOARD_BUILD_DISABLED_VBMETAIMAGE := true
|
||||
|
||||
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
# GSI is always userdebug and needs a couple of properties taking precedence
|
||||
# over those set by the vendor.
|
||||
|
|
|
@ -88,6 +88,16 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml
|
|||
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
|
||||
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
|
||||
|
||||
# Android Verified Boot (AVB):
|
||||
# Builds a special vbmeta.img that disables AVB verification.
|
||||
# Otherwise, AVB will prevent the device from booting the generic system.img.
|
||||
# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
|
||||
# metadata into system.img.
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(error BOARD_AVB_ENABLE cannot be set for GSI)
|
||||
endif
|
||||
BOARD_BUILD_DISABLED_VBMETAIMAGE := true
|
||||
|
||||
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
# GSI is always userdebug and needs a couple of properties taking precedence
|
||||
# over those set by the vendor.
|
||||
|
|
|
@ -62,6 +62,16 @@ BOARD_SEPOLICY_DIRS += \
|
|||
build/target/board/generic/sepolicy \
|
||||
build/target/board/generic_x86/sepolicy
|
||||
|
||||
# Android Verified Boot (AVB):
|
||||
# Builds a special vbmeta.img that disables AVB verification.
|
||||
# Otherwise, AVB will prevent the device from booting the generic system.img.
|
||||
# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
|
||||
# metadata into system.img.
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(error BOARD_AVB_ENABLE cannot be set for GSI)
|
||||
endif
|
||||
BOARD_BUILD_DISABLED_VBMETAIMAGE := true
|
||||
|
||||
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
# GSI is always userdebug and needs a couple of properties taking precedence
|
||||
# over those set by the vendor.
|
||||
|
|
|
@ -60,6 +60,16 @@ BOARD_SEPOLICY_DIRS += \
|
|||
build/target/board/generic/sepolicy \
|
||||
build/target/board/generic_x86/sepolicy
|
||||
|
||||
# Android Verified Boot (AVB):
|
||||
# Builds a special vbmeta.img that disables AVB verification.
|
||||
# Otherwise, AVB will prevent the device from booting the generic system.img.
|
||||
# Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity
|
||||
# metadata into system.img.
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(error BOARD_AVB_ENABLE cannot be set for GSI)
|
||||
endif
|
||||
BOARD_BUILD_DISABLED_VBMETAIMAGE := true
|
||||
|
||||
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
# GSI is always userdebug and needs a couple of properties taking precedence
|
||||
# over those set by the vendor.
|
||||
|
|
Loading…
Reference in New Issue