g12: Move kernel modules to vendor DLKM partition

Change-Id: Ifc49911dcb4988bbc3c82351e9427b610f7b75c8

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b5357f200f3ba51dfb41e73a5ef98ad835933c37..4c6e0bd450665a100253a2f7221efc31d8b4056e 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -38,7 +38,7 @@ TARGET_MODULE_ALIASES += \
 
 ## Partitions
 CORE_PARTITIONS := system vendor
-ADDITIONAL_PARTITIONS := odm product system_ext
+ADDITIONAL_PARTITIONS := odm product system_ext vendor_dlkm
 ALL_PARTITIONS := $(CORE_PARTITIONS) $(ADDITIONAL_PARTITIONS)
 
 BOARD_AMLOGIC_DYNAMIC_PARTITIONS_PARTITION_LIST := $(ALL_PARTITIONS)

diff --git a/init-files/fstab.amlogic b/init-files/fstab.amlogic
index d3513fd1df75d6d5317ae2537cd9a3b1c7376e51..624c775150be4d9057c9b9f3c4138cd7e5b09f4f 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 9d7abc4ab85021001a49f4d168cec2c76c717b2f..1344c2bf409d3e2a3a3a1b357e0c36461fe043e7 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 9dc1af20e5b329d8b492a98a97ea4cae1066f1ac..c55945b18b4bf6e3cc51e53be3926a8962575137 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -99,7 +99,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