Merge "Enables signing for generic boot images"
This commit is contained in:
commit
70ef6fd4f2
2 changed files with 6 additions and 4 deletions
|
@ -3522,12 +3522,8 @@ $(if $(BOARD_AVB_$(call to-upper,$(1))_KEY_PATH),\
|
|||
endef
|
||||
|
||||
ifdef INSTALLED_BOOTIMAGE_TARGET
|
||||
# multiple hashes for an image are not yet supported, fortunately this
|
||||
# only arises for GKI where the boot descriptor can be left out
|
||||
ifeq ($(strip $(BOARD_KERNEL_BINARIES)),)
|
||||
$(eval $(call check-and-set-avb-args,boot))
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET
|
||||
$(eval $(call check-and-set-avb-args,vendor_boot))
|
||||
|
|
|
@ -40,6 +40,12 @@ BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
|
|||
BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
|
||||
BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
|
||||
|
||||
# Enable chain partition for boot, mainly for GKI images.
|
||||
BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
|
||||
BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048
|
||||
BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
|
||||
BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2
|
||||
|
||||
# GSI specific System Properties
|
||||
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext.prop
|
||||
|
|
Loading…
Reference in a new issue