From 6715e76360de4b36f167d81a3087d9942af1dc0d Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 21 Mar 2023 15:31:40 -0700 Subject: [PATCH 1/2] Retire QEMU_USE_SYSTEM_EXT_PARTITIONS always enabled Bug: 274103438 Test: presubmit Change-Id: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74 Signed-off-by: Roman Kiryanov --- target/board/BoardConfigEmuCommon.mk | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 056a47221c..8fec037792 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -37,24 +37,16 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) BOARD_SUPER_PARTITION_SIZE ?= 8598323200 BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions - ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true) - BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - system_ext \ - product \ - vendor + BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ + system \ + system_ext \ + product \ + vendor - TARGET_COPY_OUT_PRODUCT := product - BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 - TARGET_COPY_OUT_SYSTEM_EXT := system_ext - BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 - else - TARGET_COPY_OUT_PRODUCT := system/product - TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext - BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - vendor - endif + TARGET_COPY_OUT_PRODUCT := product + BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 + TARGET_COPY_OUT_SYSTEM_EXT := system_ext + BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 # 8G BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592 From 6a4773340a2f7cf580e77bfee033ebde993e6206 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 21 Mar 2023 16:39:37 -0700 Subject: [PATCH 2/2] Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled. Bug: 274103438 Test: presubmit Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad Signed-off-by: Roman Kiryanov --- target/board/BoardConfigEmuCommon.mk | 45 +++++++++++----------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 8fec037792..3524b7cba1 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -26,38 +26,29 @@ USE_OPENGL_RENDERER := true # Emulator doesn't support sparse image format. TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true -ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) - # emulator is Non-A/B device - AB_OTA_UPDATER := false +# emulator is Non-A/B device +AB_OTA_UPDATER := false - # emulator needs super.img - BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true +# emulator needs super.img +BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true - # 8G + 8M - BOARD_SUPER_PARTITION_SIZE ?= 8598323200 - BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions +# 8G + 8M +BOARD_SUPER_PARTITION_SIZE ?= 8598323200 +BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions - BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - system_ext \ - product \ - vendor +BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ + system \ + system_ext \ + product \ + vendor - TARGET_COPY_OUT_PRODUCT := product - BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 - TARGET_COPY_OUT_SYSTEM_EXT := system_ext - BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_PRODUCT := product +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_SYSTEM_EXT := system_ext +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 - # 8G - BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592 -else ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true) - # Enable dynamic system image size and reserved 64MB in it. - BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 - BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 67108864 -else - BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 - BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640 -endif +# 8G +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592 #vendor boot BOARD_INCLUDE_DTB_IN_BOOTIMG := false