RM6785: Update dynamic partition flags

Change-Id: Ic422380c5e1ac79ba5b1b76974c77da69d5b2979
diff --git a/BoardConfig.mk b/BoardConfig.mk
index cdefa0b..66dd12f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -91,6 +91,7 @@
 BOARD_CACHEIMAGE_PARTITION_SIZE := 452984832
 BOARD_DTBOIMG_PARTITION_SIZE := 8388608
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
+ifneq ($(TARGET_RO_FILE_SYSTEM_TYPE),erofs)
 ifneq ($(WITH_GMS),true)
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 1073741824
 BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1073741824
@@ -102,15 +103,15 @@
 endif
 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 52428800
 BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE := 52428800
+endif
 
-BOARD_DYNAMIC_PARTITIONS_FILESYSTEM ?= ext4
-
+TARGET_RO_FILE_SYSTEM_TYPE ?= ext4
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := $(BOARD_DYNAMIC_PARTITIONS_FILESYSTEM)
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := $(BOARD_DYNAMIC_PARTITIONS_FILESYSTEM)
-BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := $(BOARD_DYNAMIC_PARTITIONS_FILESYSTEM)
-BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := $(BOARD_DYNAMIC_PARTITIONS_FILESYSTEM)
-BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(BOARD_DYNAMIC_PARTITIONS_FILESYSTEM)
 
 TARGET_COPY_OUT_VENDOR := vendor
 TARGET_COPY_OUT_PRODUCT := product