diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a3d830d..260387a 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -35,10 +35,10 @@ TARGET_FS_CONFIG_GEN := device/samsung/msm8226-common/config.fs
 #ADB
 TARGET_USES_LEGACY_ADB_INTERFACE :=true
 
-#HIDL
-PRODUCT_COPY_FILES += \
-    $(VENDOR_PATH)/manifest.xml:system/vendor/manifest.xml
-
+# HIDL
+DEVICE_MANIFEST_FILE := device/samsung/msm8226-common/manifest.xml
+DEVICE_MATRIX_FILE := device/samsung/msm8226-common/compatibility_matrix.xml
+    
 # Fonts
 EXTENDED_FONT_FOOTPRINT := true
 
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..a080afd
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,58 @@
+<compatibility-matrix version="1.0" type="device">
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.schedulerservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISchedulingPolicyService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.sensorservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISensorManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.allocator</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAllocator</name>
+            <instance>ashmem</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.manager</name>
+        <version>1.0</version>
+        <interface>
+            <name>IServiceManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.memory</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>ashmem</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.token</name>
+        <version>1.0</version>
+        <interface>
+            <name>ITokenManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.system.wifi.keystore</name>
+        <version>1.0</version>
+        <interface>
+            <name>IKeystore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>