StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS

Browse Source 
PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled.

Bug: 277230251
Test: presubmit
Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad
Merged-In: Ie0234187fd4689211f0d4530f9b96027567273ad
Signed-off-by: Roman Kiryanov <rkir@google.com>
This commit is contained in:
Roman Kiryanov
2023-03-21 16:39:37 -07:00
parent b790c9f1db
commit d7637446be
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
target/board/BoardConfigEmuCommon.mk
View File

@@ -26,43 +26,29 @@ USE_OPENGL_RENDERER := true
# Emulator doesn't support sparse image format. # Emulator doesn't support sparse image format.
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) # emulator is Non-A/B device
# emulator is Non-A/B device AB_OTA_UPDATER := false
AB_OTA_UPDATER := false
# emulator needs super.img # emulator needs super.img
BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
# 8G + 8M # 8G + 8M
BOARD_SUPER_PARTITION_SIZE := 8598323200 BOARD_SUPER_PARTITION_SIZE := 8598323200
BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \ BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
system \ system \
system_ext \ system_ext \
product \ product \
vendor vendor
TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_PRODUCT := product
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_COPY_OUT_SYSTEM_EXT := system_ext TARGET_COPY_OUT_SYSTEM_EXT := system_ext
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
# 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)
# Enable dynamic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 67108864
else
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640
endif
#vendor boot #vendor boot
BOARD_INCLUDE_DTB_IN_BOOTIMG := false BOARD_INCLUDE_DTB_IN_BOOTIMG := false