From f53de92c9293f0eb8d55466a700f45ce4c1fecbe Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Wed, 2 Mar 2022 12:29:57 -0800 Subject: [PATCH] Pixel T launch devices: Enable system_dlkm Set flags to enable system_dlkm dynmaic partition for GKI Modules for T launch pixel devices. Partition will be empty as of now but this adds enough support to pass the vts for feature. Bug: 222334390 Test: TH, manual build, Code testing gs101 & R6 Signed-off-by: Ramji Jiyani Change-Id: Ic56dd711ab97f3ae993cc5c543fabc8cbe3f347c Merged-In: Ic56dd711ab97f3ae993cc5c543fabc8cbe3f347c --- BoardConfig-common.mk | 9 ++++++++- conf/fstab.gs201.in | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index d5e67aca..fdf9ef83 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -60,6 +60,7 @@ AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ system \ + system_dlkm \ system_ext \ product \ vbmeta_system @@ -127,7 +128,7 @@ endif #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true # Enable chain partition for system. -BOARD_AVB_VBMETA_SYSTEM := system system_ext product +BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) @@ -184,6 +185,7 @@ BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ system \ + system_dlkm \ system_ext \ product \ vendor \ @@ -192,6 +194,11 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ # Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336 +# Build a separate system_dlkm partition +BOARD_USES_SYSTEM_DLKMIMAGE := true +BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs +TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm + # # AUDIO & VOICE # diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 82e637c7..4444b9c5 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -5,6 +5,7 @@ # # system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor erofs ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128