From f803c049b6fead3fbb9b5c0cf009e8e95d88a493 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Fri, 26 Aug 2022 08:36:52 +0800
Subject: [PATCH] Move bt Compatibility matrix to gs-common

Bug: 242661555
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: Ia772f658dbbee6ea497f5f1e4e9e7f046cbe13e6
---
 device.mk                           |  2 +-
 device_framework_matrix_product.xml | 32 -----------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/device.mk b/device.mk
index 6c491a80..8c48288b 100644
--- a/device.mk
+++ b/device.mk
@@ -1180,7 +1180,7 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
 # Install product specific framework compatibility matrix
 # (TODO: b/169535506) This includes the FCM for system_ext and product partition.
 # It must be split into the FCM of each partition.
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs201/device_framework_matrix_product.xml
 
 # Preopt SystemUI
 PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle  # For internal
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index c6ea0193..e0a9a602 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -126,38 +126,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.bt_channel_avoidance</name>
-        <version>1.0</version>
-        <interface>
-            <name>IBTChannelAvoidance</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.sar</name>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothSar</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>hardware.google.bluetooth.ext</name>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothExt</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>hardware.google.bluetooth.ewp</name>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothEwp</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
         <version>1</version>