commit 3f852994b489372f8ce22bfe011e21241f85a1dc
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 23 02:44:45 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 23 02:44:45 2022 +0000
tree 3002da8aee408a383d3b97431f40002a1458ddd7
parent 15ecbb0810fedc995ef031715e3499c373535a18
parent 8c7f820512c0613fa8d473d2c1aab94d828f28fa

Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 890fc04..0d47e63 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3843,8 +3843,7 @@
     --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 @@
 # 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)