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