diff --git a/BoardConfig.mk b/BoardConfig.mk
index 894aa5e..2337261 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -15,6 +15,14 @@ TARGET_BOOTLOADER_BOARD_NAME := bangkk
TARGET_SURFACEFLINGER_UDFPS_LIB := //$(DEVICE_PATH):libudfps_extension.bangkk
SOONG_CONFIG_qtidisplay_udfps := true
+# HIDL
+ODM_MANIFEST_SKUS += b d de dn n
+ODM_MANIFEST_B_FILES := $(DEVICE_PATH)/sku/manifest_b.xml
+ODM_MANIFEST_D_FILES := $(DEVICE_PATH)/sku/manifest_d.xml
+ODM_MANIFEST_DE_FILES := $(DEVICE_PATH)/sku/manifest_de.xml
+ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/sku/manifest_dn.xml
+ODM_MANIFEST_N_FILES := $(DEVICE_PATH)/sku/manifest_n.xml
+
# Kernel
BOARD_KERNEL_CMDLINE += androidboot.hab.product=bangkk
TARGET_KERNEL_CONFIG += vendor/ext_config/moto-holi-bangkk.config
diff --git a/sku/manifest_b.xml b/sku/manifest_b.xml
new file mode 100644
index 0000000..bbcba83
--- /dev/null
+++ b/sku/manifest_b.xml
@@ -0,0 +1,80 @@
+
+
+
+ android.hardware.nfc
+ hwbinder
+
+
+ android.hardware.radio
+ hwbinder
+ @1.2::ISap/slot1
+ @1.5::IRadio/slot1
+
+
+ android.hardware.secure_element
+ hwbinder
+ @1.2::ISecureElement/SIM1
+
+
+ vendor.qti.esepowermanager
+ hwbinder
+
+
+ vendor.qti.hardware.data.connection
+ hwbinder
+ @1.1::IDataConnection/slot1
+
+
+ vendor.qti.hardware.data.iwlan
+ hwbinder
+ @1.0::IIWlan/slot1
+
+
+ vendor.qti.hardware.qteeconnector
+ hwbinder
+
+
+ vendor.qti.hardware.radio.am
+ hwbinder
+ @1.0::IQcRilAudio/slot1
+
+
+ vendor.qti.hardware.radio.ims
+ hwbinder
+ @1.7::IImsRadio/imsradio0
+
+
+ vendor.qti.hardware.radio.lpa
+ hwbinder
+ @1.1::IUimLpa/UimLpa0
+
+
+ vendor.qti.hardware.radio.qcrilhook
+ hwbinder
+ @1.0::IQtiOemHook/oemhook0
+
+
+ vendor.qti.hardware.radio.qtiradio
+ hwbinder
+ @1.0::IQtiRadio/slot1
+ @2.7::IQtiRadio/slot1
+
+
+ vendor.qti.hardware.radio.uim
+ hwbinder
+ @1.2::IUim/Uim0
+
+
+ vendor.qti.hardware.radio.uim_remote_client
+ hwbinder
+ @1.0::IUimRemoteServiceClient/uimRemoteClient0
+
+
+ vendor.qti.hardware.radio.uim_remote_server
+ hwbinder
+ @1.0::IUimRemoteServiceServer/uimRemoteServer0
+
+
diff --git a/sku/manifest_d.xml b/sku/manifest_d.xml
new file mode 100644
index 0000000..ed3baf7
--- /dev/null
+++ b/sku/manifest_d.xml
@@ -0,0 +1,24 @@
+
+
+
+ android.hardware.nfc
+ hwbinder
+
+
+ android.hardware.secure_element
+ hwbinder
+ @1.2::ISecureElement/SIM1
+ @1.2::ISecureElement/SIM2
+
+
+ vendor.qti.esepowermanager
+ hwbinder
+
+
+ vendor.qti.hardware.qteeconnector
+ hwbinder
+
+
diff --git a/sku/manifest_de.xml b/sku/manifest_de.xml
new file mode 100644
index 0000000..74ccb64
--- /dev/null
+++ b/sku/manifest_de.xml
@@ -0,0 +1,28 @@
+
+
+
+ android.hardware.nfc
+ hwbinder
+ @1.2::INfc/default
+
+
+ android.hardware.secure_element
+ hwbinder
+ @1.2::ISecureElement/SIM1
+ @1.2::ISecureElement/eSE1
+
+
+ vendor.qti.esepowermanager
+ hwbinder
+ @1.1::IEsePowerManager/default
+
+
+ vendor.qti.hardware.qteeconnector
+ hwbinder
+ @1.0::IAppConnector/default
+ @1.0::IGPAppConnector/default
+
+
diff --git a/sku/manifest_dn.xml b/sku/manifest_dn.xml
new file mode 100644
index 0000000..bed8b21
--- /dev/null
+++ b/sku/manifest_dn.xml
@@ -0,0 +1,25 @@
+
+
+
+ android.hardware.nfc
+ hwbinder
+ @1.2::INfc/default
+
+
+ android.hardware.secure_element
+ hwbinder
+ @1.2::ISecureElement/SIM1
+ @1.2::ISecureElement/SIM2
+
+
+ vendor.qti.esepowermanager
+ hwbinder
+
+
+ vendor.qti.hardware.qteeconnector
+ hwbinder
+
+
diff --git a/sku/manifest_n.xml b/sku/manifest_n.xml
new file mode 100644
index 0000000..e63e746
--- /dev/null
+++ b/sku/manifest_n.xml
@@ -0,0 +1,81 @@
+
+
+
+ android.hardware.nfc
+ hwbinder
+ @1.2::INfc/default
+
+
+ android.hardware.radio
+ hwbinder
+ @1.2::ISap/slot1
+ @1.5::IRadio/slot1
+
+
+ android.hardware.secure_element
+ hwbinder
+ @1.2::ISecureElement/SIM1
+
+
+ vendor.qti.esepowermanager
+ hwbinder
+
+
+ vendor.qti.hardware.data.connection
+ hwbinder
+ @1.1::IDataConnection/slot1
+
+
+ vendor.qti.hardware.data.iwlan
+ hwbinder
+ @1.0::IIWlan/slot1
+
+
+ vendor.qti.hardware.qteeconnector
+ hwbinder
+
+
+ vendor.qti.hardware.radio.am
+ hwbinder
+ @1.0::IQcRilAudio/slot1
+
+
+ vendor.qti.hardware.radio.ims
+ hwbinder
+ @1.7::IImsRadio/imsradio0
+
+
+ vendor.qti.hardware.radio.lpa
+ hwbinder
+ @1.1::IUimLpa/UimLpa0
+
+
+ vendor.qti.hardware.radio.qcrilhook
+ hwbinder
+ @1.0::IQtiOemHook/oemhook0
+
+
+ vendor.qti.hardware.radio.qtiradio
+ hwbinder
+ @1.0::IQtiRadio/slot1
+ @2.7::IQtiRadio/slot1
+
+
+ vendor.qti.hardware.radio.uim
+ hwbinder
+ @1.2::IUim/Uim0
+
+
+ vendor.qti.hardware.radio.uim_remote_client
+ hwbinder
+ @1.0::IUimRemoteServiceClient/uimRemoteClient0
+
+
+ vendor.qti.hardware.radio.uim_remote_server
+ hwbinder
+ @1.0::IUimRemoteServiceServer/uimRemoteServer0
+
+