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

Commit 15647823 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45 

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

Change-Id: I0778b96d661d597d6bd3b0421e7ff11f3ded0e1f
parents c54b57c9 f07ceb45

core/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -4446,7 +4446,8 @@ endif 


ifdef BUILDING_BOOT_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_RAMDISK_FILES)

else ifdef INTERNAL_PREBUILT_BOOTIMAGE

endif

ifneq (,$(INTERNAL_PREBUILT_BOOTIMAGE) $(filter true,$(BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES)))

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BOOTIMAGE_TARGET)

endif
@@ -4745,10 +4746,12 @@ ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE 
	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef INTERNAL_PREBUILT_BOOTIMAGE

ifneq (,$(INTERNAL_PREBUILT_BOOTIMAGE) $(filter true,$(BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES)))

ifdef INSTALLED_BOOTIMAGE_TARGET

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_BOOTIMAGE_TARGET) $(zip_root)/IMAGES/

endif

endif # INSTALLED_BOOTIMAGE_TARGET

endif # INTERNAL_PREBUILT_BOOTIMAGE != "" || BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES == true

ifdef BOARD_PREBUILT_ODMIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_ODMIMAGE_TARGET) $(zip_root)/IMAGES/

core/board_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -107,11 +107,14 @@ _board_strip_readonly_list += \ 
#   recovery resources are built to vendor_boot.

# - BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT controls whether GSI AVB keys are

#   built to vendor_boot.

# - BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES controls whether boot images in $OUT are added

#   to target files package directly.

_board_strip_readonly_list += \

  BOARD_USES_GENERIC_KERNEL_IMAGE \

  BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE \

  BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT \

  BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT \

  BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES \



_build_broken_var_list := \

  BUILD_BROKEN_DUP_RULES \

target/board/generic_arm64/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ BOARD_USES_RECOVERY_AS_BOOT := 
TARGET_NO_KERNEL := false

BOARD_USES_GENERIC_KERNEL_IMAGE := true

BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := 5.4-android12-0

# Copy boot image in $OUT to target files. This is defined for targets where

# the installed GKI APEXes are built from source.

BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES := true



# No vendor_boot

BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT :=