commit 40783868d850d0158208982ff3c4f572052b9905
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 16 06:06:35 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 16 06:06:35 2022 +0000
tree 81a2b37a071b816f512666ea0134068320a9b899
parent da66e2c46d3141109425e98a4612814eb61c5273
parent 8131404331a57f45ab98d04c17db73ace160624b

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

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

Change-Id: I4c051b6573a270b5867bda9ba20179fe210839fb

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