Merge "Retire QEMU_DISABLE_AVB" am: e8554eff3a am: 3bd2cb00da

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

Change-Id: Icdb2e1586f7ca248cc8d067dd6f22e77f642c343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-03-22 03:50:12 +00:00 committed by Automerger Merge Worker
commit a509c972f5

View file

@ -58,11 +58,6 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
# 8G # 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)
BOARD_AVB_ENABLE := false
endif
else ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true) else ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)
# Enable dynamic system image size and reserved 64MB in it. # Enable dynamic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864