Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 043da90f authored by Bo Hu's avatar Bo Hu Committed by Automerger Merge Worker
Browse files

Merge "emulator: do not enforce 8G system image partition" am: 7012508b am:... 

Merge "emulator: do not enforce 8G system image partition" am: 7012508b am: 7624c44f am: 50fd1924

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



Change-Id: I79f68a7521f9d56b2cbd394193638ebf3a0fd7c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b403f85 50fd1924

target/board/BoardConfigEmuCommon.mk

+2 −2
Original line number Diff line number Diff line
@@ -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)