commit 8131404331a57f45ab98d04c17db73ace160624b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 16 05:37:43 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 16 05:37:43 2022 +0000
tree 81a2b37a071b816f512666ea0134068320a9b899
parent 9a21773efed0ea3d52c34d6ff2cc11203d3eb3ed
parent 662a2c610a94f18694f8584d3b7dfc390a900345

Merge "Clear OS version and patch level fields for GKI boot images"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 15e2c2f..cf50dc8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -957,9 +957,15 @@
   endif
 endif # BUILDING_VENDOR_BOOT_IMAGE == "" && BOARD_USES_GENERIC_KERNEL_IMAGE != true
 
-INTERNAL_MKBOOTIMG_VERSION_ARGS := \
+ifdef BOARD_GKI_SIGNING_KEY_PATH
+  # GKI boot images will not set system version & SPL value in the header.
+  # They can be set by the device manufacturer in the AVB properties instead.
+  INTERNAL_MKBOOTIMG_VERSION_ARGS :=
+else
+  INTERNAL_MKBOOTIMG_VERSION_ARGS := \
     --os_version $(PLATFORM_VERSION_LAST_STABLE) \
     --os_patch_level $(PLATFORM_SECURITY_PATCH)
+endif # BOARD_GKI_SIGNING_KEY_PATH
 
 # $(1): image target to certify
 # $(2): out certificate target