From 9791518d588d4e7d6ee348c18b4da105855f9d78 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 6 Dec 2018 18:25:32 +0000 Subject: [PATCH] Set TARGET_COPY_OUT_ for product/vendor in mainline This product variable is used to generate the loader config (to use either /system/product or /product), and the vendor one is likely used in similar ways. Having these partitions is required for mainline devices, so set it in the shared BoardConfig. Bug: 80410283 Test: make Change-Id: I6f2d94ff43572a28df54ea8c60f2d838a3b9216c --- target/board/BoardConfigGsiCommon.mk | 4 ++-- target/board/BoardConfigMainlineCommon.mk | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index f9e9ee100d..05ce35fb59 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -25,8 +25,8 @@ TARGET_USERIMAGES_USE_F2FS := true # Enable dynamic system image size and reserved 64MB in it. BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 -# GSI always requires separate vendor packages to vendor.img -TARGET_COPY_OUT_VENDOR := vendor +# GSI forces product packages to /system for now. +TARGET_COPY_OUT_PRODUCT := system/product # Creates metadata partition mount point under root for # the devices with metadata parition diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index ec3c74f81a..46e5d93032 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -8,6 +8,10 @@ TARGET_NO_KERNEL := true TARGET_USERIMAGES_USE_EXT4 := true +# Mainline devices must have /vendor and /product partitions. +TARGET_COPY_OUT_VENDOR := vendor +TARGET_COPY_OUT_PRODUCT := product + # system-as-root is mandatory from Android P TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true