From b9af035ee728401c233ca12de91a5a2b415c22f0 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Fri, 14 May 2021 17:55:32 +0800 Subject: [PATCH] BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root Starting from Android 10, the system.img layout consists of $TARGET_SYSTEM_OUT and $TARGET_ROOT_OUT, and is mounted by the init as root. That is, system.img is always created as if BOARD_BUILD_SYSTEM_ROOT_IMAGE was set. https://source.android.com/devices/bootloader/partitions/system-as-root The previous concern is that there might be compatibility issues between the ramdisk contained in boot.img with a newer system.img. But this is no longer an issue after we always mount the system.img as root. Bug: 187157581 Test: Tree Hugger Change-Id: I4537e6ce6fb39b4b86caac82a13716abf515ffd6 Merged-In: I4537e6ce6fb39b4b86caac82a13716abf515ffd6 (cherry picked from commit 640544bd96946b5a512c59d42e3f3c24682697fe) --- core/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 3a66b924b..233c51547 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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)))