Merge changes I0465632f,I9f8f85fb
* changes:
Revert "Revert "Add extra VNDK versions to cuttlefish targets""
Raise super image size: 11.5 GB -> 12 GB
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index fa96982..03bb59d 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -140,10 +140,10 @@
TARGET_RECOVERY_FSTAB ?= device/google/cuttlefish/shared/config/fstab
-BOARD_SUPER_PARTITION_SIZE := 12348030976
+BOARD_SUPER_PARTITION_SIZE := 12884901888
BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions
BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := system vendor product system_ext
-BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6174015488
+BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6442450944
BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true
TARGET_RELEASETOOLS_EXTENSIONS := device/google/cuttlefish/shared
diff --git a/shared/device.mk b/shared/device.mk
index 548dd7b..dfb0a93 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -365,3 +365,5 @@
# Host packages to install
PRODUCT_HOST_PACKAGES += socket_forward_proxy socket_vsock_proxy
+
+PRODUCT_EXTRA_VNDK_VERSIONS := 28 29