From f9cd28b3fcff631f21bd0e3fee1f697285063542 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Mon, 1 Aug 2022 14:17:42 +0800
Subject: [PATCH] Add AIDL support on IBluetoothCcc

Bug: 239658601
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I3eb04d4d9d6f5cfcd3cbbc37d6712114d520cfea
---
 device-cheetah.mk                   |  1 +
 device-cloudripper.mk               |  1 +
 device-panther.mk                   |  1 +
 device-ravenclaw.mk                 |  1 +
 device_framework_matrix_product.xml | 10 ++++++++++
 5 files changed, 14 insertions(+)
 create mode 100644 device_framework_matrix_product.xml

diff --git a/device-cheetah.mk b/device-cheetah.mk
index 3bc8f534..1815b8c8 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -31,6 +31,7 @@ include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),)
 include device/google/pantah/uwb/uwb_calibration.mk
 endif
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 184fd071..f16be676 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -27,6 +27,7 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 $(call soong_config_set,lyric,tuning_product,cloudripper)
 $(call soong_config_set,google3a_config,target_device,cloudripper)
 
diff --git a/device-panther.mk b/device-panther.mk
index d3624cfc..da15834b 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -31,6 +31,7 @@ include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 $(call soong_config_set,lyric,tuning_product,panther)
 $(call soong_config_set,google3a_config,target_device,panther)
 
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index 1c1ac1f8..066d88ed 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -27,6 +27,7 @@ include device/google/pantah/audio/ravenclaw/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
 ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),)
 include device/google/gs101/uwb/uwb.mk
 include device/google/pantah/uwb/uwb_calibration.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
new file mode 100644
index 00000000..26436bb3
--- /dev/null
+++ b/device_framework_matrix_product.xml
@@ -0,0 +1,10 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ccc</name>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothCcc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
-- 
GitLab