summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BoardConfig-common.mk3
-rw-r--r--compatibility_matrix_userdebug.xml10
-rw-r--r--device_framework_matrix.xml8
-rw-r--r--framework_manifest_userdebug.xml (renamed from manifest_userdebug.xml)2
4 files changed, 13 insertions, 10 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index e219cbbc..58f1bad4 100644
--- 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
new file mode 100644
index 00000000..d678a598
--- /dev/null
+++ 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
index 74b76182..58e7b912 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -103,14 +103,6 @@
</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>
<interface>
diff --git a/manifest_userdebug.xml b/framework_manifest_userdebug.xml
index cd720759..8ff68adf 100644
--- a/manifest_userdebug.xml
+++ b/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>