g12: Move kernel modules to vendor DLKM partition

Change-Id: Ifc49911dcb4988bbc3c82351e9427b610f7b75c8

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 3c3da6f77cfd7583958a89d9d7dcba192477792d..7f3ff2875e73c85c6e74ae6ed2560a1142546c0c 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -35,7 +35,7 @@ TARGET_MODULE_ALIASES += \
 
 ## Partitions
 SSI_PARTITIONS := product system system_ext
-TREBLE_PARTITIONS := odm vendor
+TREBLE_PARTITIONS := odm vendor vendor_dlkm
 ALL_PARTITIONS := $(SSI_PARTITIONS) $(TREBLE_PARTITIONS)
 
 BOARD_AMLOGIC_DYNAMIC_PARTITIONS_PARTITION_LIST := $(ALL_PARTITIONS)

diff --git a/init-files/fstab.amlogic b/init-files/fstab.amlogic
index 9945c3a01787fc8b343ee0b3d08fdd5bb5d41afd..3bf686d719038326124352589e9bffd1c71a605b 100644 (file)
--- a/init-files/fstab.amlogic
+++ b/init-files/fstab.amlogic
@@ -4,6 +4,7 @@ product               /product            ext4      ro,barrier=1
 system                /system             ext4      ro,barrier=1                                                     wait,avb=vbmeta,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey"
 system_ext            /system_ext         ext4      ro,barrier=1                                                     wait,avb,logical,first_stage_mount
 vendor                /vendor             ext4      ro,barrier=1                                                     wait,avb,logical,first_stage_mount
+vendor_dlkm           /vendor_dlkm        ext4      ro,barrier=1                                                     wait,avb,logical,first_stage_mount
 
 ## Block devices
 /dev/block/boot       /boot               emmc      defaults                                                         recoveryonly

diff --git a/init-files/fstab_no_avb.amlogic b/init-files/fstab_no_avb.amlogic
index 16e5ddd3456edf4074e65acd5df152beb78907c8..b50523027b3f3c89e1f4fdca926413d86fb9c63a 100644 (file)
--- a/init-files/fstab_no_avb.amlogic
+++ b/init-files/fstab_no_avb.amlogic
@@ -4,6 +4,7 @@ product               /product            ext4      ro,barrier=1
 system                /system             ext4      ro,barrier=1                                                     wait,logical,first_stage_mount
 system_ext            /system_ext         ext4      ro,barrier=1                                                     wait,logical,first_stage_mount
 vendor                /vendor             ext4      ro,barrier=1                                                     wait,logical,first_stage_mount
+vendor_dlkm           /vendor_dlkm        ext4      ro,barrier=1                                                     wait,logical,first_stage_mount
 
 ## Block devices
 /dev/block/boot       /boot               emmc      defaults                                                         recoveryonly

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 1761bbae2e6dc5225c75d7f72d0fd834a8c51020..9f3315c361261f4adb805ff389bd9c0ed0bd04bc 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -80,7 +80,7 @@ vendor/etc/vintf/manifest/android.hardware.health@2.1-servcie.droidlogic.xml
 vendor/lib/hw/android.hardware.health@2.0-impl-2.1.droidlogic.so
 
 ## Kernel Modules
-vendor/lib/modules/amlogic_fbc_lib.ko
+vendor/lib/modules/amlogic_fbc_lib.ko:vendor_dlkm/lib/modules/amlogic_fbc_lib.ko
 
 ## ICU
 vendor/lib/libicuuc_vendor.so