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

Commit 0dc6f217 authored by Michael Schwartz's avatar Michael Schwartz Committed by Jaekyun Seok
Browse files

Support prebuilt bootimage 

Bug: 63676296
Test: `m -j` and inspect artifacts
Merged-In: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
Change-Id: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
(cherry picked from commit b0b1a24b)
parent 87dded44

core/Makefile

+14 −2
Original line number Diff line number Diff line
@@ -628,6 +628,8 @@ ramdisk-nodeps: $(MKBOOTFS) | $(MINIGZIP) 
	@echo "make $@: ignoring dependencies"

	$(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $(INSTALLED_RAMDISK_TARGET)



INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img



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



# -----------------------------------------------------------------
@@ -666,8 +668,6 @@ INTERNAL_MKBOOTIMG_VERSION_ARGS := \ 
    --os_version $(PLATFORM_VERSION) \

    --os_patch_level $(PLATFORM_SECURITY_PATCH)



INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img



# BOARD_USES_RECOVERY_AS_BOOT = true must have BOARD_BUILD_SYSTEM_ROOT_IMAGE = true.

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
@@ -750,6 +750,13 @@ endif # TARGET_BOOTIMAGE_USE_EXT2 
endif # BOARD_USES_RECOVERY_AS_BOOT



else	# TARGET_NO_KERNEL

ifdef BOARD_PREBUILT_BOOTIMAGE

ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

# Remove when b/63676296 is resolved.

$(error Prebuilt bootimage is only supported for AB targets)

endif

$(eval $(call copy-one-file,$(BOARD_PREBUILT_BOOTIMAGE),$(INSTALLED_BOOTIMAGE_TARGET)))

else

INTERNAL_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE))

# HACK: The top-level targets depend on the bootimage.  Not all targets

# can produce a bootimage, though, and emulator targets need the ramdisk
@@ -758,6 +765,7 @@ INTERNAL_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE)) 
#       kernel-less inputs.

INSTALLED_BOOTIMAGE_TARGET := $(INSTALLED_RAMDISK_TARGET)

endif

endif



# -----------------------------------------------------------------

# NOTICE files
@@ -2531,6 +2539,10 @@ ifdef BOARD_PREBUILT_VENDORIMAGE 
	$(hide) mkdir -p $(zip_root)/IMAGES

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

endif

ifdef BOARD_PREBUILT_BOOTIMAGE

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

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

endif

ifdef BOARD_PREBUILT_DTBOIMAGE

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

	$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/