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

Commit bde804c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix GKI 2.0 signing in the release process" am: 328a537e 

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

Change-Id: Ia7394629a55cac686968e3d89a7e85442207ab8c
parents 6fd4524d 328a537e

target/board/BoardConfigGsiCommon.mk

+8 −0
Original line number Diff line number Diff line
@@ -30,6 +30,14 @@ BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := 
# the devices with metadata parition

BOARD_USES_METADATA_PARTITION := true



# Enable GKI 2.0 signing.

BOARD_GKI_SIGNING_KEY_PATH := build/make/target/product/gsi/testkey_rsa2048.pem

BOARD_GKI_SIGNING_ALGORITHM := SHA256_RSA2048

# The following is needed to allow release signing process appends more extra

# args, e.g., passing --signing_helper_with_files from mkbootimg to avbtool.

# See b/178559811 for more details.

BOARD_GKI_SIGNING_SIGNATURE_ARGS := --prop foo:bar



# Android Verified Boot (AVB):

#   Set the rollback index to zero, to prevent the device bootloader from

#   updating the last seen rollback index in the tamper-evident storage.

target/board/generic_arm64/BoardConfig.mk

+0 −4
Original line number Diff line number Diff line
@@ -77,10 +77,6 @@ BOARD_RAMDISK_USE_LZ4 := true 
BOARD_BOOT_HEADER_VERSION := 4

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)



# Enable GKI 2.0 signing.

BOARD_GKI_SIGNING_KEY_PATH := build/make/target/product/gsi/testkey_rsa2048.pem

BOARD_GKI_SIGNING_ALGORITHM := SHA256_RSA2048



BOARD_KERNEL_BINARIES := \

    kernel-4.19-gz \

    kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \