Merge "emulator: do not enforce 8G system image partition" am: 7012508bf5 am: 7624c44f1d

Original change: https://android-review.googlesource.com/c/platform/build/+/2393534

Change-Id: I80bd9334465dd074ec0d55f4d096b5fe9c4cc397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bo Hu
2023-01-23 21:00:49 +00:00
committed by Automerger Merge Worker

View File

@@ -34,7 +34,7 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
# 8G + 8M
BOARD_SUPER_PARTITION_SIZE := 8598323200
BOARD_SUPER_PARTITION_SIZE ?= 8598323200
BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true)
@@ -57,7 +57,7 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
endif
# 8G
BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592
BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592
# in build environment to speed up make -j
ifeq ($(QEMU_DISABLE_AVB),true)