From d7637446be900dcc35a9c35d817fed8ce05c2274 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 21 Mar 2023 16:39:37 -0700 Subject: [PATCH] Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled. Bug: 277230251 Test: presubmit Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad Merged-In: Ie0234187fd4689211f0d4530f9b96027567273ad Signed-off-by: Roman Kiryanov --- target/board/BoardConfigEmuCommon.mk | 50 ++++++++++------------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 5f34b68592..5e7647613f 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -26,43 +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 - - # in build environment to speed up make -j - ifeq ($(QEMU_DISABLE_AVB),true) - BOARD_AVB_ENABLE := false - endif -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