From 54b624dfbb9de3377a4145cde4134f7565e56911 Mon Sep 17 00:00:00 2001
From: amwatson <contact@fewerwrong.org>
Date: Tue, 5 Mar 2024 18:52:26 -0600
Subject: [PATCH] Restore [fixed] Khronos OpenXR loader path. Remove
 uses-native-library as it's no longer needed

---
 .gitmodules                                  |  3 +++
 externals/openxr-sdk-src                     |  1 +
 src/android/app/src/main/AndroidManifest.xml | 11 +----------
 3 files changed, 5 insertions(+), 10 deletions(-)
 create mode 160000 externals/openxr-sdk-src

diff --git a/.gitmodules b/.gitmodules
index 1b72ddb32..f39d0253e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,6 @@
 [submodule "oaknut"]
 	path = externals/oaknut
 	url = https://github.com/merryhime/oaknut.git
+[submodule "externals/openxr-sdk-src"]
+	path = externals/openxr-sdk-src
+	url = https://github.com/KhronosGroup/OpenXR-SDK-Source
diff --git a/externals/openxr-sdk-src b/externals/openxr-sdk-src
new file mode 160000
index 000000000..9ad84df70
--- /dev/null
+++ b/externals/openxr-sdk-src
@@ -0,0 +1 @@
+Subproject commit 9ad84df70aeaee3c7306a67f700fb69bd86ff6b3
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml
index 7e9bd9c5a..5740cc44f 100644
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <!-- (1/2) These two sections allow us to avoid pulling Oculus SDK's libopenxr_loader into our app and use the Apache-licensed OpenXR loader instead.
+    <!-- This section allows us to avoid pulling Oculus SDK's libopenxr_loader into our app and use the Apache-licensed OpenXR loader instead.
       Khronos' loader will pull in the Oculus implementation from "libopenxr_forwardloader.oculus.so",
       which is a system library resident on the OS image and therefore falls under the GPL "system libraries" exception. -->
     <uses-permission android:name="org.khronos.openxr.permission.OPENXR_SYSTEM" />
@@ -65,15 +65,6 @@
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true">
 
-
-        <!-- (2/2) Allows us to avoid pulling Oculus SDK's libopenxr_loader into our
-        app and use the Apache-licensed OpenXR loader directly. This line (along
-        with System.LoadLibrary in VrActivity.java) is needed to correctly open
-          the system library. -->
-        <uses-native-library
-            android:name="libopenxr_forwardloader.oculus.so"
-            android:required="false" />
-
         <meta-data android:name="android.game_mode_config"
             android:resource="@xml/game_mode_config" />