From 0b1838a0019eae94f2c2e1d9931bbdb33ac28dad Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 01:43:40 +0000
Subject: [PATCH] Revert "Bluetooth: Reset packages/apps/Bluetooth to upstream"

This reverts commit 4ceb47e32c1be30640e40f81b6f741942f8598ed.
---
 Android.bp                 | 5 -----
 tests/robotests/Android.mk | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index c16faff96..08e0ee116 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,3 @@
-// Bluetooth is in it's own namespace to allow it to be replaced with an
-// alternate implementation.
-soong_namespace {
-}
-
 // MAP API module
 
 java_library {
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index 678ab4bc1..0cb6917ce 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(TARGET_USE_QTI_BT_STACK),true)
-
 #############################################################
 # Bluetooth Robolectric test target.                        #
 #############################################################
@@ -47,5 +45,3 @@ LOCAL_TEST_PACKAGE := Bluetooth
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
 
 include external/robolectric-shadows/run_robotests.mk
-
-endif
-- 
2.25.1