diff --git a/Android.mk b/Android.mk index 0a1e24b..7418cd5 100644 --- a/Android.mk +++ b/Android.mk @@ -103,9 +103,9 @@ INTERNAL_VENDOR_RAMDISK_TARGET := $(call intermediates-dir-for,PACKAGING,vendor_ $(VENDOR_RAMDISK_KERNEL_MODULES): $(INSTALLED_KERNEL_TARGET) @echo "Copying kernel modules to vendor ramdisk: $@" @mkdir -p $(dir $@) - cp $(@F:%=$(TARGET_OUT_VENDOR)/lib/modules/%) $(TARGET_VENDOR_RAMDISK_OUT)/lib/modules/ - cp $(TARGET_OUT_VENDOR)/lib/modules/modules.dep $(TARGET_VENDOR_RAMDISK_OUT)/lib/modules/ - sed -i "s/\/vendor//g" $(TARGET_VENDOR_RAMDISK_OUT)/lib/modules/modules.dep + cp $(@F:%=$(TARGET_OUT_VENDOR_DLKM)/lib/modules/%) $(TARGET_VENDOR_RAMDISK_OUT)/lib/modules/ + cp $(TARGET_OUT_VENDOR_DLKM)/lib/modules/modules.dep $(TARGET_VENDOR_RAMDISK_OUT)/lib/modules/ + sed -i "s/\/vendor_dlkm//g" $(TARGET_VENDOR_RAMDISK_OUT)/lib/modules/modules.dep $(INTERNAL_VENDOR_RAMDISK_TARGET): $(VENDOR_RAMDISK_KERNEL_MODULES) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index b5b9391..3dd3778 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -81,7 +81,8 @@ AB_OTA_PARTITIONS += \ vbmeta \ vbmeta_system \ vendor \ - vendor_boot + vendor_boot \ + vendor_dlkm # ANT+ BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" @@ -162,7 +163,8 @@ BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_ONEPLUS_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor +BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_ONEPLUS_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor vendor_dlkm BOARD_ONEPLUS_DYNAMIC_PARTITIONS_SIZE := 5591007232 BOARD_SUPER_PARTITION_GROUPS := oneplus_dynamic_partitions BOARD_SUPER_PARTITION_SIZE := 11190403072 @@ -171,6 +173,7 @@ TARGET_COPY_OUT_ODM := odm TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_SYSTEM_EXT := system_ext TARGET_COPY_OUT_VENDOR := vendor +TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm # Power TARGET_TAP_TO_WAKE_NODE := "/proc/touchpanel/double_tap_enable" diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 9556886..41e8175 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -39,6 +39,7 @@ system /system e system_ext /system_ext ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount product /product ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount +vendor_dlkm /vendor_dlkm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount odm /odm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount /dev/block/bootdevice/by-name/opluslog /mnt/vendor/op2 ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check