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

Commit 20ac8fb2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root" am: ab85371d 

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

Change-Id: I8e4dc3875ab7cc7cc7d6bd555dba16c82b1a6645
parents 0603f227 ab85371d

core/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -1034,10 +1034,6 @@ endif # BUILDING_BOOT_IMAGE 


else # TARGET_NO_KERNEL == "true"

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

INTERNAL_PREBUILT_BOOTIMAGE := $(BOARD_PREBUILT_BOOTIMAGE)

INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img

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