diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2021-10-21 07:22:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-21 07:22:03 +0000 |
| commit | 09f68abca769321b0d6c58d9581f76fb3181667c (patch) | |
| tree | 7dbf9b3703a84444f2003da079cbe7ed81d13df8 | |
| parent | be32848ce6f6037389196755d9a60594d91c6d15 (diff) | |
| parent | ffb366ee9953843df8d90714bd4ece019ac95faa (diff) | |
| download | build-09f68abca769321b0d6c58d9581f76fb3181667c.tar.gz | |
Merge "Revert "Renames boot-debug-*.img in GSI targets""
| -rw-r--r-- | core/Makefile | 8 | ||||
| -rw-r--r-- | core/board_config.mk | 6 | ||||
| -rw-r--r-- | core/product.mk | 3 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 4 |
4 files changed, 4 insertions, 17 deletions
diff --git a/core/Makefile b/core/Makefile index b268f57402..2e72727cde 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 diff --git a/core/board_config.mk b/core/board_config.mk index aff6a4de51..40b6b3fba9 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -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),) diff --git a/core/product.mk b/core/product.mk index db7e2a8c92..1b3c9f5b23 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 9237cb7940..94917f5757 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -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 |