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

Merge "Renames boot-debug-*.img in GSI targets"

Browse Source
This commit is contained in:
Treehugger Robot
2021-09-25 03:33:40 +00:00
committed by Gerrit Code Review
parent 128bfc440e a2a5db4466
commit b7aced88d6
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -2361,10 +2361,10 @@ ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
ifneq ($(INSTALLED_BOOTIMAGE_TARGET),) ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)
ifneq ($(strip $(TARGET_NO_KERNEL)),true) ifneq ($(strip $(TARGET_NO_KERNEL)),true)
ifneq ($(strip $(BOARD_KERNEL_BINARIES)),) ifneq ($(strip $(BOARD_KERNEL_BINARIES)),)
INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,boot-debug,$(BOARD_KERNEL_BINARIES)), \ INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,$(DEBUG_RAMDISK_BOOT_IMAGE_NAME),$(BOARD_KERNEL_BINARIES)), \
$(PRODUCT_OUT)/$(k).img) $(PRODUCT_OUT)/$(k).img)
else else
INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot-debug.img INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/$(DEBUG_RAMDISK_BOOT_IMAGE_NAME).img
endif endif
# Replace ramdisk.img in $(MKBOOTIMG) ARGS with ramdisk-debug.img to build boot-debug.img # Replace ramdisk.img in $(MKBOOTIMG) ARGS with ramdisk-debug.img to build boot-debug.img
@@ -2398,10 +2398,10 @@ endef
# $(1): output file # $(1): output file
define build-debug-bootimage-target define build-debug-bootimage-target
$(MKBOOTIMG) --kernel $(PRODUCT_OUT)/$(subst .img,,$(subst boot-debug,kernel,$(notdir $(1)))) \ $(MKBOOTIMG) --kernel $(PRODUCT_OUT)/$(subst .img,,$(subst $(DEBUG_RAMDISK_BOOT_IMAGE_NAME),kernel,$(notdir $(1)))) \
$(INTERNAL_DEBUG_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) \ $(INTERNAL_DEBUG_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) \
$(INTERNAL_MKBOOTIMG_GKI_SINGING_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $1 $(INTERNAL_MKBOOTIMG_GKI_SINGING_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $1
$(if $(BOARD_AVB_BOOT_KEY_PATH),$(call test-key-sign-bootimage,$1,boot-debug)) $(if $(BOARD_AVB_BOOT_KEY_PATH),$(call test-key-sign-bootimage,$1,$(DEBUG_RAMDISK_BOOT_IMAGE_NAME)))
endef endef
# Depends on original boot.img and ramdisk-debug.img, to build the new boot-debug.img # Depends on original boot.img and ramdisk-debug.img, to build the new boot-debug.img

6
core/board_config.mk
View File

@@ -397,6 +397,12 @@ else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),true)
endif endif
.KATI_READONLY := BUILDING_BOOT_IMAGE .KATI_READONLY := BUILDING_BOOT_IMAGE
DEBUG_RAMDISK_BOOT_IMAGE_NAME := boot-debug
ifneq ($(PRODUCT_DEBUG_RAMDISK_BOOT_IMAGE_NAME),)
DEBUG_RAMDISK_BOOT_IMAGE_NAME := $(PRODUCT_DEBUG_RAMDISK_BOOT_IMAGE_NAME)
endif
.KATI_READONLY := DEBUG_RAMDISK_BOOT_IMAGE_NAME
# Are we building a recovery image # Are we building a recovery image
BUILDING_RECOVERY_IMAGE := BUILDING_RECOVERY_IMAGE :=
ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),) ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),)

3
core/product.mk
View File

@@ -278,6 +278,9 @@ _product_single_value_vars += \
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \ PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \
PRODUCT_USES_DEFAULT_ART_CONFIG \ PRODUCT_USES_DEFAULT_ART_CONFIG \
# The file name for the boot image with a debug ramdisk.
_product_single_value_vars += PRODUCT_DEBUG_RAMDISK_BOOT_IMAGE_NAME
_product_single_value_vars += PRODUCT_SYSTEM_SERVER_COMPILER_FILTER _product_single_value_vars += PRODUCT_SYSTEM_SERVER_COMPILER_FILTER
# Per-module sanitizer configs # Per-module sanitizer configs
_product_list_vars += PRODUCT_SANITIZER_MODULE_CONFIGS _product_list_vars += PRODUCT_SANITIZER_MODULE_CONFIGS

4
target/product/gsi_release.mk
View File

@@ -78,3 +78,7 @@ MODULE_BUILD_FROM_SOURCE := true
# Additional settings used in all GSI builds # Additional settings used in all GSI builds
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.crypto.metadata_init_delete_all_keys.enabled=false \ ro.crypto.metadata_init_delete_all_keys.enabled=false \
# Renames boot-debug-*.img to boot-with-debug-ramdisk-*.img to avoid confusion
# with GKI boot images.
PRODUCT_DEBUG_RAMDISK_BOOT_IMAGE_NAME := boot-with-debug-ramdisk