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

Merge "Various fixes to PRODUCT_BUILD_<IMAGE> variables." am: 9b7cce9417

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

Change-Id: Id39b7eab3c5ed08b98aa1766991b08ab7898018e
This commit is contained in:
Treehugger Robot
2020-10-09 17:56:30 +00:00
committed by Automerger Merge Worker
parent c8acaa6f82 9b7cce9417
commit 2f7b994a6f
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -2094,6 +2094,7 @@ endif # BUILDING_RAMDISK_IMAGE
# #
# Note: it's intentional to skip signing for boot-debug.img, because it # 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. # can only be used if the device is unlocked with verification error.
ifdef BUILDING_BOOT_IMAGE
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,boot-debug,$(BOARD_KERNEL_BINARIES)), \
@@ -2148,6 +2149,7 @@ bootimage_debug-nodeps: $(MKBOOTIMG)
$(foreach b,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(call build-debug-bootimage-target,$b)) $(foreach b,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(call build-debug-bootimage-target,$b))
endif # TARGET_NO_KERNEL endif # TARGET_NO_KERNEL
endif # BUILDING_BOOT_IMAGE
ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true) ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
ifeq ($(BUILDING_RAMDISK_IMAGE),true) ifeq ($(BUILDING_RAMDISK_IMAGE),true)

33
core/board_config.mk
View File

@@ -342,23 +342,29 @@ endif
# Are we building a boot image # Are we building a boot image
BUILDING_BOOT_IMAGE := BUILDING_BOOT_IMAGE :=
ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),)
BUILDING_BOOT_IMAGE := ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),) BUILDING_BOOT_IMAGE :=
ifdef BOARD_BOOTIMAGE_PARTITION_SIZE else ifdef BOARD_BOOTIMAGE_PARTITION_SIZE
BUILDING_BOOT_IMAGE := true BUILDING_BOOT_IMAGE := true
endif endif
else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),true) else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),true)
BUILDING_BOOT_IMAGE := true ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
$(warning *** PRODUCT_BUILD_BOOT_IMAGE is true, but so is BOARD_USES_RECOVERY_AS_BOOT.)
$(warning *** Skipping building boot image.)
BUILDING_BOOT_IMAGE :=
else
BUILDING_BOOT_IMAGE := true
endif
endif endif
.KATI_READONLY := BUILDING_BOOT_IMAGE .KATI_READONLY := BUILDING_BOOT_IMAGE
# Are we building a recovery image # Are we building a recovery image
BUILDING_RECOVERY_IMAGE := BUILDING_RECOVERY_IMAGE :=
ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),)
BUILDING_RECOVERY_IMAGE := true ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
else ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),) BUILDING_RECOVERY_IMAGE := true
ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE else ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE
ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))
BUILDING_RECOVERY_IMAGE := true BUILDING_RECOVERY_IMAGE := true
endif endif
@@ -372,7 +378,14 @@ endif
BUILDING_VENDOR_BOOT_IMAGE := BUILDING_VENDOR_BOOT_IMAGE :=
ifdef BOARD_BOOT_HEADER_VERSION ifdef BOARD_BOOT_HEADER_VERSION
ifneq ($(call math_gt_or_eq,$(BOARD_BOOT_HEADER_VERSION),3),) ifneq ($(call math_gt_or_eq,$(BOARD_BOOT_HEADER_VERSION),3),)
ifneq ($(TARGET_NO_VENDOR_BOOT),true) ifneq ($(TARGET_NO_VENDOR_BOOT),)
$(warning TARGET_NO_VENDOR_BOOT has been deprecated. Please use PRODUCT_BUILD_VENDOR_BOOT_IMAGE.)
ifneq ($(TARGET_NO_VENDOR_BOOT),true)
BUILDING_VENDOR_BOOT_IMAGE := true
endif
else ifeq ($(PRODUCT_BUILD_VENDOR_BOOT_IMAGE),)
BUILDING_VENDOR_BOOT_IMAGE := true
else ifeq ($(PRODUCT_BUILD_VENDOR_BOOT_IMAGE),true)
BUILDING_VENDOR_BOOT_IMAGE := true BUILDING_VENDOR_BOOT_IMAGE := true
endif endif
endif endif

1
core/product.mk
View File

@@ -380,6 +380,7 @@ _product_single_value_vars += PRODUCT_BUILD_RAMDISK_IMAGE
_product_single_value_vars += PRODUCT_BUILD_USERDATA_IMAGE _product_single_value_vars += PRODUCT_BUILD_USERDATA_IMAGE
_product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE _product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE
_product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE _product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE
_product_single_value_vars += PRODUCT_BUILD_VENDOR_BOOT_IMAGE
_product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE _product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE
# List of boot jars delivered via apex # List of boot jars delivered via apex