summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2018-03-28 17:49:09 -0700
committerYifan Hong <elsk@google.com>2018-03-29 16:43:57 -0700
commit43e683d73e56a75176d042892ba9f12a89983185 (patch)
tree4fae3668d17e5a8e21f5968676d32c0d8abd340d
parent914017b40cb9f9dd414552e28063d21f15f2019f (diff)
downloadmarlin-43e683d73e56a75176d042892ba9f12a89983185.tar.gz
Specify DEVICE_FRAMEWORK_COMPAT_MATRIX
Test: builds (check vintf metadata) Test: boots Test: vts_treble_vintf_test Bug: 65028233 Change-Id: I4c5cd9e08b8711ba192b51e6975d506ef34f3112
-rw-r--r--device_framework_matrix.xml18
-rw-r--r--marlin/BoardConfig.mk1
-rw-r--r--sailfish/BoardConfig.mk1
3 files changed, 20 insertions, 0 deletions
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
new file mode 100644
index 00000000..6863271a
--- /dev/null
+++ b/device_framework_matrix.xml
@@ -0,0 +1,18 @@
+<compatibility-matrix version="1.0" type="framework">
+ <hal format="hidl" optional="true">
+ <name>vendor.qti.atcmdfwd</name>
+ <version>1.0</version>
+ <interface>
+ <name>IAtCmdFwd</name>
+ <instance>AtCmdFwdService</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.qti.qcril.am</name>
+ <version>1.0</version>
+ <interface>
+ <name>IQcRilAudio</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</compatibility-matrix>
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 6586916f..3fee8257 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -205,6 +205,7 @@ endif
DEVICE_MANIFEST_FILE := device/google/marlin/manifest.xml
DEVICE_MATRIX_FILE := device/google/marlin/compatibility_matrix.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/marlin/device_framework_matrix.xml
# Exclude serif fonts for saving system.img size.
EXCLUDE_SERIF_FONTS := true
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index 7a175f06..29e6e7f9 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -191,6 +191,7 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
DEVICE_MANIFEST_FILE := device/google/marlin/manifest.xml
DEVICE_MATRIX_FILE := device/google/marlin/compatibility_matrix.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/marlin/device_framework_matrix.xml
# Exclude serif fonts for saving system.img size.
EXCLUDE_SERIF_FONTS := true