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

Commit a1abac89 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enables signing for generic boot images" into rvc-dev am: 2fc5a393 

Change-Id: I6a819a3bc7edb1283c644480fb969d1cf0d2f459
parents b4e1c8c3 2fc5a393

core/Makefile

+0 −4
Original line number Original line Diff line number Diff line
@@ -3472,12 +3472,8 @@ $(if $(BOARD_AVB_$(call to-upper,$(1))_KEY_PATH),\ 
endef

endef





ifdef INSTALLED_BOOTIMAGE_TARGET

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))

$(eval $(call check-and-set-avb-args,boot))

endif

endif

endif





ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET

ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET

$(eval $(call check-and-set-avb-args,vendor_boot))

$(eval $(call check-and-set-avb-args,vendor_boot))

target/board/BoardConfigGsiCommon.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,12 @@ 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





# 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

# GSI specific System Properties

ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext.prop

TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext.prop