summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Yoshida <gyoshida@google.com>2019-08-21 10:28:27 -0700
committerGrant Yoshida <gyoshida@google.com>2019-08-21 23:30:11 +0000
commit74b8bd1ee30d1b4d1a94a29be085b697db209d9f (patch)
tree1c19788f7bf0d2dcc6d74782db64148db6e0a9ff
parent29752274f790402c8a436f3295117ef9ff75e2aa (diff)
downloadvrservices-74b8bd1ee30d1b4d1a94a29be085b697db209d9f.tar.gz
Fix bluetooth not working on the OnePlus7 Pro.
For GSI XR, added a symlink from libbluetooth_qti.so to libbluetooth.so. Bug: 139486342 Test: Paired a controller running GSI XR on the OnePlus7 Pro. Change-Id: I599ed4dd8e14ae68800478a80bd98229aa0a1229
-rw-r--r--xr/packages/BluetoothQtiSymlink/Android.mk20
-rw-r--r--xr/products/experimental_google_xr.mk1
2 files changed, 21 insertions, 0 deletions
diff --git a/xr/packages/BluetoothQtiSymlink/Android.mk b/xr/packages/BluetoothQtiSymlink/Android.mk
new file mode 100644
index 0000000..b25835a
--- /dev/null
+++ b/xr/packages/BluetoothQtiSymlink/Android.mk
@@ -0,0 +1,20 @@
+#
+# 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 2aebc58..b04e997 100644
--- a/xr/products/experimental_google_xr.mk
+++ b/xr/products/experimental_google_xr.mk
@@ -45,4 +45,5 @@ PRODUCT_PACKAGES += \
VrInputMethodIme \
VrHeadsetPowerPolicy \
pps-tool.sh \
+ BluetoothQtiSymlink \