atcmdfwd: correct vintf

This HAL is served from a system app and used by a vendor daemon. Test: ls /system/app/atfwd/atfwd.apk Test: ls /vendor/bin/ATFWD-daemon Test: lshal Bug: 130714844 Change-Id: I75227e4366c367ba5b27880e11e9eac368e77654
LineageOS · Apr 22, 2019 · 78f382c · 78f382c
1 parent 0035512
commit 78f382c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
@@ -191,7 +191,8 @@ DEVICE_FRAMEWORK_MANIFEST_FILE := device/google/bonito/framework_manifest.xml
 
 # Userdebug only Vendor Interface Manifest
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-DEVICE_MANIFEST_FILE += device/google/bonito/manifest_userdebug.xml
+DEVICE_FRAMEWORK_MANIFEST_FILE += device/google/bonito/framework_manifest_userdebug.xml
+DEVICE_MATRIX_FILE += device/google/bonito/compatibility_matrix_userdebug.xml
 endif
 
 ODM_MANIFEST_SKUS := \

diff --git a/compatibility_matrix_userdebug.xml b/compatibility_matrix_userdebug.xml
@@ -0,0 +1,10 @@
+<compatibility-matrix version="1.0" type="device">
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.radio.atcmdfwd</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAtCmdFwd</name>
+            <instance>AtCmdFwdService</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
@@ -102,14 +102,6 @@
             <instance>slot2</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.radio.atcmdfwd</name>
-        <version>1.0</version>
-        <interface>
-            <name>IAtCmdFwd</name>
-            <instance>AtCmdFwdService</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.ims</name>
         <version>1.2</version>

diff --git a/manifest_userdebug.xml → framework_manifest_userdebug.xml b/manifest_userdebug.xml → framework_manifest_userdebug.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="framework">
     <hal format="hidl">
         <name>vendor.qti.hardware.radio.atcmdfwd</name>
         <transport>hwbinder</transport>