From b790c9f1db927d89e403eef9e8055dc10d01cfa8 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Tue, 21 Mar 2023 15:31:40 -0700 Subject: [PATCH] Retire QEMU_USE_SYSTEM_EXT_PARTITIONS always enabled Bug: 277230251 Test: presubmit Change-Id: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74 Merged-In: 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 c0e8730e91..5f34b68592 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