From c311ff6b68e3ff501b286e5f951e37bb010ab570 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Fri, 25 Dec 2020 10:46:11 +0800 Subject: [PATCH] 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index a37582687..342abd71e 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -33,8 +33,8 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) # 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 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 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)