StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8768138d82af53b3903e97fe1f6cb7e10e973f97
This commit is contained in:
Treehugger Robot
2022-03-16 06:31:37 +00:00
committed by Automerger Merge Worker
parent 8dd153d008 40783868d8
commit 6debab1cf8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -957,9 +957,15 @@ else ifndef BUILDING_VENDOR_BOOT_IMAGE # && BOARD_USES_GENERIC_KERNEL_IMAGE != t
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