Allow userdata image size to be overridden

Some code coverage use cases require more space, so allow those users to
specify a larger userdata size for cuttlefish on the build command line.

Bug: 173450308
Change-Id: I40de9a571912bf465146b089e2a39a9960e63c27
Merged-In: I40de9a571912bf465146b089e2a39a9960e63c27
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 7c5f6ed..76b25b7 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -69,8 +69,8 @@
 # The compiler will occasionally generate movaps, etc.
 BOARD_MALLOC_ALIGNMENT := 16
 
-# Make the userdata partition 4.25G to accomodate ASAN and CTS
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 4563402752
+# Make the userdata partition 6G to accommodate ASAN and CTS
+BOARD_USERDATAIMAGE_PARTITION_SIZE := $(TARGET_USERDATAIMAGE_PARTITION_SIZE)
 TARGET_USERIMAGES_SPARSE_F2FS_DISABLED := true
 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := $(TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE)
 TARGET_USERIMAGES_USE_F2FS := true
diff --git a/shared/device.mk b/shared/device.mk
index 72e27d7..55f8f90 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -31,6 +31,7 @@
 PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for vulkan
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE ?= f2fs
+TARGET_USERDATAIMAGE_PARTITION_SIZE ?= 6442450944
 
 TARGET_VULKAN_SUPPORT ?= true