From f03caf56f20332f5b5608a5b4ba731649d5af343 Mon Sep 17 00:00:00 2001
From: Usama Arif <usama.arif@arm.com>
Date: Tue, 23 Mar 2021 11:10:06 +0000
Subject: tc0: nano: Revert BluetoothQtiSymlink module

Android tries to build this for tc0_nano target and fails.
This module is not needed for tc0.

Signed-off-by: Usama Arif <usama.arif@arm.com>
Change-Id: Ib165f6fcc13b2dc44657e806154a7f366a7fac96
---
 ...bluetooth-not-working-on-the-OnePlus7-Pro.patch | 51 ++++++++++++++++++++++
 tc0/vendorsetup.sh                                 |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 tc0/patches/0001-Revert-Fix-bluetooth-not-working-on-the-OnePlus7-Pro.patch

diff --git a/tc0/patches/0001-Revert-Fix-bluetooth-not-working-on-the-OnePlus7-Pro.patch b/tc0/patches/0001-Revert-Fix-bluetooth-not-working-on-the-OnePlus7-Pro.patch
new file mode 100644
index 0000000..4cc69ea
--- /dev/null
+++ b/tc0/patches/0001-Revert-Fix-bluetooth-not-working-on-the-OnePlus7-Pro.patch
@@ -0,0 +1,51 @@
+From 11e63fba60b2ea64d17fceb7cea8a595243ddb04 Mon Sep 17 00:00:00 2001
+From: Usama Arif <usama.arif@arm.com>
+Date: Thu, 18 Mar 2021 18:55:25 +0000
+Subject: [PATCH] Revert "Fix bluetooth not working on the OnePlus7 Pro."
+
+This reverts commit 74b8bd1ee30d1b4d1a94a29be085b697db209d9f.
+---
+ xr/packages/BluetoothQtiSymlink/Android.mk | 20 --------------------
+ xr/products/experimental_google_xr.mk      |  1 -
+ 2 files changed, 21 deletions(-)
+ delete mode 100644 xr/packages/BluetoothQtiSymlink/Android.mk
+
+diff --git a/xr/packages/BluetoothQtiSymlink/Android.mk b/xr/packages/BluetoothQtiSymlink/Android.mk
+deleted file mode 100644
+index b25835a..0000000
+--- a/xr/packages/BluetoothQtiSymlink/Android.mk
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#
+-# This is a workaround for Bluetooth not working on OnePlus7 Pro. See b/139486342
+-#
+-
+-LOCAL_PATH := $(call my-dir)
+-
+-include $(CLEAR_VARS)
+-
+-LOCAL_MODULE := BluetoothQtiSymlink
+-
+-lib_dir := $(PRODUCT_OUT)/system/lib
+-bluetooth_qti := libbluetooth_qti.so
+-bluetooth := libbluetooth.so
+-bluetooth_qti_path := $(lib_dir)/$(bluetooth_qti)
+-bluetooth_path := $(lib_dir)/$(bluetooth)
+-
+-$(bluetooth_qti_path): $(bluetooth_path)
+-	cd $(lib_dir) && ln -sf $(bluetooth) $(bluetooth_qti)
+-
+-droid: $(bluetooth_qti_path)
+diff --git a/xr/products/experimental_google_xr.mk b/xr/products/experimental_google_xr.mk
+index 999b719..f354fe4 100644
+--- a/xr/products/experimental_google_xr.mk
++++ b/xr/products/experimental_google_xr.mk
+@@ -48,5 +48,4 @@ PRODUCT_PACKAGES += \
+     VrInputMethodIme \
+     VrHeadsetPowerPolicy \
+     pps-tool.sh \
+-    BluetoothQtiSymlink \
+ 
+-- 
+2.17.1
+
diff --git a/tc0/vendorsetup.sh b/tc0/vendorsetup.sh
index 60f548a..a0388cd 100644
--- a/tc0/vendorsetup.sh
+++ b/tc0/vendorsetup.sh
@@ -37,3 +37,4 @@ apply_patch "system/core" "0001-Add-amba-bus-support-to-platform-devices.patch"
 apply_patch "external/minigbm" "0001-minigbm-komeda-Add-driver.patch"
 apply_patch "external/swiftshader" "0001-Don-t-unlock-Android-buffers-immediately-after-locki.patch"
 apply_patch "device/generic/goldfish" "0001-Add-fvp_mini-launch-target.patch"
+apply_patch "device/google/vrservices/" "0001-Revert-Fix-bluetooth-not-working-on-the-OnePlus7-Pro.patch"
-- 
cgit v1.2.3