commit c311ff6b68e3ff501b286e5f951e37bb010ab570
author Isaac Chen <ycchen@google.com> Fri Dec 25 10:46:11 2020 +0800
committer Isaac Chen <ycchen@google.com> Fri Dec 25 06:14:43 2020 +0000
tree 7c799ca845f4c6af557b00a0b0fd6b8e317fcc69
parent 7af0218468290c3f9c3189b31ffd1ea862933ce3

Update GF board variable for dynamic partition

Goldfish specific board variable:

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE

is used to create misc_info.txt, which is needed to mix GSI or CSI on
Goldfish vendor image, and need to reflect the size of the current
super.img, which is now set to 4G+8M (from 3G+8M previously).

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
      super_emulator_dynamic_partitions_group_size=4294967296
Change-Id: Idd0fb302b20780ac97959fabec231a632205d46d

target/board/BoardConfigEmuCommon.mk

diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk
index a375826..342abd7 100644
--- a/target/board/BoardConfigEmuCommon.mk
+++ b/target/board/BoardConfigEmuCommon.mk
@@ -33,8 +33,8 @@
   # emulator needs super.img
   BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
 
-  # 4G
-  BOARD_SUPER_PARTITION_SIZE := 4294967296
+  # 4G + 8M
+  BOARD_SUPER_PARTITION_SIZE := 4303355904
   BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
 
   ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true)
@@ -56,8 +56,8 @@
         vendor
   endif
 
-  # 3G
-  BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472
+  # 4G
+  BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 4294967296
 
   # in build environment to speed up make -j
   ifeq ($(QEMU_DISABLE_AVB),true)