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

Commit 392b2a86 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Renames boot-debug-*.img in GSI targets"" am: 09f68abc 

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

Change-Id: I62a6823907586b627437012eb335c3116cafa7d1
parents b999ea37 09f68abc

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -2359,10 +2359,10 @@ ramdisk_debug-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS) 
# Note: it's intentional to skip signing for boot-debug.img, because it

# can only be used if the device is unlocked with verification error.

ifneq ($(strip $(BOARD_KERNEL_BINARIES)),)

  INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,$(DEBUG_RAMDISK_BOOT_IMAGE_NAME),$(BOARD_KERNEL_BINARIES)), \

  INSTALLED_DEBUG_BOOTIMAGE_TARGET := $(foreach k,$(subst kernel,boot-debug,$(BOARD_KERNEL_BINARIES)), \

         $(PRODUCT_OUT)/$(k).img)

else

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

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

endif



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


# $(1): output file

define build-debug-bootimage-target

  $(MKBOOTIMG) --kernel $(PRODUCT_OUT)/$(subst .img,,$(subst $(DEBUG_RAMDISK_BOOT_IMAGE_NAME),kernel,$(notdir $(1)))) \

  $(MKBOOTIMG) --kernel $(PRODUCT_OUT)/$(subst .img,,$(subst boot-debug,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,$(DEBUG_RAMDISK_BOOT_IMAGE_NAME)))

  $(if $(BOARD_AVB_BOOT_KEY_PATH),$(call test-key-sign-bootimage,$1,boot-debug))

endef



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

core/board_config.mk

+0 −6
Original line number Diff line number Diff line
@@ -411,12 +411,6 @@ 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

+0 −3
Original line number Diff line number Diff line
@@ -279,9 +279,6 @@ _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

+0 −4
Original line number Diff line number Diff line
@@ -81,7 +81,3 @@ 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