Merge changes Ie7238a2a,I197dc83a
am: a533beb366
Change-Id: I5c365466401aa2de92712219d083554a2531d717
diff --git a/db845c.mk b/db845c.mk
index 48f7875..3d44eb3 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -8,3 +8,13 @@
PRODUCT_NAME := db845c
PRODUCT_DEVICE := db845c
PRODUCT_BRAND := Android
+
+ifneq ($(DB845C_USES_GKI),)
+# The path here need to be finalized (ideally in the dragonboard-kernel dir)
+DB845C_MOD_DIR := device/linaro/dragonboard/db845c-mods/
+DB845C_MODS := $(wildcard $(DB845C_MOD_DIR)/*.ko)
+ifneq ($(DB845C_MODS),)
+ BOARD_VENDOR_KERNEL_MODULES += $(DB845C_MODS)
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(DB845C_MODS)
+endif
+endif
diff --git a/sepolicy/kernel.te b/sepolicy/kernel.te
index 46bfee5..3fad122 100644
--- a/sepolicy/kernel.te
+++ b/sepolicy/kernel.te
@@ -3,3 +3,5 @@
allow kernel device:dir { add_name create write };
allow kernel self:capability mknod;
allow kernel vendor_file:file { open read };
+allow kernel self:system module_request;
+allow vendor_init kernel:system module_request;
diff --git a/ueventd.common.rc b/ueventd.common.rc
index 173b6f4..b87dccf 100644
--- a/ueventd.common.rc
+++ b/ueventd.common.rc
@@ -1,3 +1,5 @@
+modalias_handling enabled
+
/dev/sw_sync 0660 root graphics
# gpu