Merge pull request amwatson#17 from gyroninja/ignore-link-fail

Ignore failures to load openxr_forwardloader.oculus for v62+
gyroninja · Jan 23, 2024 · 4758326 · 4758326
2 parents e1398b6 + 1412662
commit 4758326
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/externals/openxr-sdk-src b/externals/openxr-sdk-src
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/vr/VrActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/vr/VrActivity.java
@@ -6,6 +6,7 @@
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.hardware.display.DisplayManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Display;
 import android.view.InputDevice;
@@ -26,6 +27,17 @@ public class VrActivity extends EmulationActivity {
     public static VrActivity currentActivity = null;
     ClickRunnable clickRunnable = new ClickRunnable();
 
+    static {
+        if (Build.BRAND.equals("oculus")) {
+            try {
+                System.loadLibrary("openxr_forwardloader.oculus");
+            } catch (UnsatisfiedLinkError e) {
+                // This was needed before v62
+                // In v62 this library is deleted
+            }
+        }
+    }
+
     public final ActivityResultLauncher<SoftwareKeyboard.KeyboardConfig> mVrKeyboardLauncher =
         registerForActivityResult(new VrKeyboardActivity.Contract(),
                                   result -> VrKeyboardActivity.onFinishResult(result));