archive/CitraVR
1
0
Fork 0
mirror of https://github.com/amwatson/CitraVR.git synced 2024-09-19 19:01:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Restore [fixed] Khronos OpenXR loader path. Remove uses-native-library as it's no longer needed

Browse source
This commit is contained in:
amwatson 2024-03-05 18:52:26 -06:00
parent 071e6c664f
commit 54b624dfbb
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -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

1
externals/openxr-sdk-src vendored Submodule

@ -0,0 +1 @@
Subproject commit 9ad84df70aeaee3c7306a67f700fb69bd86ff6b3

11
src/android/app/src/main/AndroidManifest.xml
View file

@ -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" />