Merge "Support prebuilt bootimage" (945fd2bd) · Commits · e / os / android_build

core/Makefile

+14 −2

Original line number	Diff line number	Diff line
		@@ -579,6 +579,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)

		# -----------------------------------------------------------------
		@@ -617,8 +619,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)
		@@ -701,6 +701,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
		@@ -709,6 +716,7 @@ INTERNAL_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE))
		# kernel-less inputs.
		INSTALLED_BOOTIMAGE_TARGET := $(INSTALLED_RAMDISK_TARGET)
		endif
		endif

		# -----------------------------------------------------------------
		# NOTICE files
		@@ -2482,6 +2490,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/