From 8c7f820512c0613fa8d473d2c1aab94d828f28fa Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Tue, 22 Feb 2022 14:47:45 +0800 Subject: [PATCH] Adding BOOT_OS_VERSION for the AVB prop in a boot.img Devices using a prebuilt boot.img, e.g., a GKI, will re-sign the boot.img to append AVB footers. Currently the value of "com.android.build.boot.os_version" in the AVB footer is set to the Android platform version. However, the GKI image might be from another release branch, e.g., using a Android12-5.10 GKI in a Android 13 codebase. Adding BOOT_OS_VERSION to allow specify the value separately. Bug: 211364958 Test: make, then `avbtool info_image --image $OUT/boot.img`. Change-Id: I335cc7b6c5a455d566f364df6a7dae79facc7a87 --- core/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 890fc04e88..0d47e633b6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3843,8 +3843,7 @@ BOARD_AVB_SYSTEM_EXT_ADD_HASHTREE_FOOTER_ARGS += \ --prop com.android.build.system_ext.security_patch:$(PLATFORM_SECURITY_PATCH) BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ - --prop com.android.build.boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \ - --prop com.android.build.boot.os_version:$(PLATFORM_VERSION_LAST_STABLE) + --prop com.android.build.boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.init_boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \ @@ -3885,6 +3884,14 @@ BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \ # The following vendor- and odm-specific images needs explicit SPL set per board. # TODO(b/210875415) Is this security_patch property used? Should it be removed from # boot.img when there is no platform ramdisk included in it? +ifdef BOOT_OS_VERSION +BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ + --prop com.android.build.boot.os_version:$(BOOT_OS_VERSION) +else +BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ + --prop com.android.build.boot.os_version:$(PLATFORM_VERSION_LAST_STABLE) +endif + ifdef BOOT_SECURITY_PATCH BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.boot.security_patch:$(BOOT_SECURITY_PATCH)