diff options
| -rw-r--r-- | shared/BoardConfig.mk | 7 | ||||
| -rw-r--r-- | shared/config/fstab.ext4 | 1 | ||||
| -rw-r--r-- | shared/config/fstab.f2fs | 1 | ||||
| -rw-r--r-- | shared/device.mk | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index c661d7584..8a8e65016 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk @@ -49,6 +49,11 @@ BOARD_USES_ODMIMAGE := true BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_ODM := odm +# Build a separate vendor_dlkm partition +BOARD_USES_VENDOR_DLKMIMAGE := true +BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm + # FIXME: Remove this once we generate the vbmeta digest correctly BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2 @@ -156,7 +161,7 @@ TARGET_RECOVERY_FSTAB ?= device/google/cuttlefish/shared/config/fstab.f2fs BOARD_SUPER_PARTITION_SIZE := 6442450944 BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions -BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor +BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor vendor_dlkm BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6442450944 BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true diff --git a/shared/config/fstab.ext4 b/shared/config/fstab.ext4 index b7c22e2c3..daaec53f8 100644 --- a/shared/config/fstab.ext4 +++ b/shared/config/fstab.ext4 @@ -11,6 +11,7 @@ odm /odm ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect, product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb=vbmeta_system vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb=vbmeta +vendor_dlkm /vendor_dlkm ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb /dev/block/zram0 none swap defaults zramsize=75% /tmp /sdcard none defaults,bind recoveryonly /devices/*/block/vdb auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata diff --git a/shared/config/fstab.f2fs b/shared/config/fstab.f2fs index a9a6718d2..128fa98df 100644 --- a/shared/config/fstab.f2fs +++ b/shared/config/fstab.f2fs @@ -11,6 +11,7 @@ odm /odm ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect, product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb=vbmeta_system vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb=vbmeta +vendor_dlkm /vendor_dlkm ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect,avb /dev/block/zram0 none swap defaults zramsize=75% /tmp /sdcard none defaults,bind recoveryonly /devices/*/block/vdb auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata diff --git a/shared/device.mk b/shared/device.mk index 1fd093e0c..f54d2b1dc 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -44,7 +44,8 @@ AB_OTA_PARTITIONS += \ system_ext \ vbmeta \ vbmeta_system \ - vendor + vendor \ + vendor_dlkm \ # Enable Virtual A/B $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) |