From fc51a00551b3d7b6dc730307d053ea8c963418b9 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 22 Sep 2022 00:40:01 +0100
Subject: [PATCH] universal7885: Drop component overrides

This is no longer needed as of Android 13.

Change-Id: I38435c47c8781678f82014decbbae40dcab0a07b
---
 .../configs/sysconfig/component-overrides.xml | 21 -------------------
 universal7885-common/universal7885-common.mk  |  4 ----
 2 files changed, 25 deletions(-)
 delete mode 100644 universal7885-common/configs/sysconfig/component-overrides.xml

diff --git a/universal7885-common/configs/sysconfig/component-overrides.xml b/universal7885-common/configs/sysconfig/component-overrides.xml
deleted file mode 100644
index a58bb34..0000000
--- a/universal7885-common/configs/sysconfig/component-overrides.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<config>
-   <component-override package="com.android.bluetooth">
-      <component class=".avrcpcontroller.AvrcpControllerService" enabled="true"/>
-      <component class=".hid.HidDeviceService" enabled="true"/>
-      <component class=".sap.SapService" enabled="true"/>
-   </component-override>
-</config>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 1ca4f3f..981883b 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -309,10 +309,6 @@ PRODUCT_SOONG_NAMESPACES += \
     hardware/google/pixel \
     hardware/samsung
 
-# Sysconfig
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/sysconfig/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides-bt.xml
-
 # Thermal
 PRODUCT_PACKAGES += \
     android.hardware.thermal@1.0-impl \