Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c1450d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88 am: d995c9e2 

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

Change-Id: I86df86c895440f1066fe5ab2bb055fd97d3dc85b
parents e3eb8979 d995c9e2

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -2361,10 +2361,10 @@ ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true) 
ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)

ifneq ($(strip $(TARGET_NO_KERNEL)),true)

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)

else

  INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot-debug.img

  INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/$(DEBUG_RAMDISK_BOOT_IMAGE_NAME).img

endif



# Replace ramdisk.img in $(MKBOOTIMG) ARGS with ramdisk-debug.img to build boot-debug.img
@@ -2398,10 +2398,10 @@ endef 


# $(1): output file

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_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



# Depends on original boot.img and ramdisk-debug.img, to build the new boot-debug.img

core/board_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -397,6 +397,12 @@ else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),true) 
endif

.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

BUILDING_RECOVERY_IMAGE :=

ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),)

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ _product_single_value_vars += \ 
    PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \

    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

# Per-module sanitizer configs

_product_list_vars += PRODUCT_SANITIZER_MODULE_CONFIGS

target/product/gsi_release.mk

+4 −0
Original line number Diff line number Diff line
@@ -82,3 +82,7 @@ MODULE_BUILD_FROM_SOURCE := true 
# Additional settings used in all GSI builds

PRODUCT_PRODUCT_PROPERTIES += \

    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