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

Merge changes Ie0234187,Iace22e38 am: e042768922 am: aa44c8d68f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2500963

Change-Id: Idf93078c8adbc3fd24dad203cc12a278bb3eae7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-23 19:46:30 +00:00
committed by Automerger Merge Worker
parent e89fa4075a aa44c8d68f
commit 654bd5065b
1 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
target/board/BoardConfigEmuCommon.mk
View File

@@ -26,46 +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
ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true) 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
else
TARGET_COPY_OUT_PRODUCT := system/product
TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
system \
vendor
endif
# 8G # 8G
BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592
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