From 773fc96ab287730bdcc4779d21e79fc95142aa65 Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuyakou@gmail.com>
Date: Thu, 15 May 2025 16:28:07 -0700
Subject: [PATCH 1/2] Update the logic to validate the java version

Loosen the check to allow Java version >= 17
---
 platform/android/java/app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle
index eddf2e27c4..36accd4df8 100644
--- a/platform/android/java/app/build.gradle
+++ b/platform/android/java/app/build.gradle
@@ -269,8 +269,8 @@ task copyAndRenameBinary(type: Copy) {
  * Used to validate the version of the Java SDK used for the Godot gradle builds.
  */
 task validateJavaVersion {
-    if (JavaVersion.current() != versions.javaVersion) {
-        throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Godot gradle builds.")
+    if (!JavaVersion.current().isCompatibleWith(versions.javaVersion)) {
+        throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the minimum supported Java version for Godot gradle builds.")
     }
 }
 

From 1b0bd35f09454811e96a714c2185705238ee1dc9 Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuyakou@gmail.com>
Date: Thu, 15 May 2025 16:30:38 -0700
Subject: [PATCH 2/2] Update the GodotOpenXR meta-data removal logic

Godot OpenXR Vendor plugin version 4.0.0-stable changed the plugin's manifest declaration, so this updates the logic to remove that manifest declaration to match.
---
 .../java/editor/src/horizonos/AndroidManifest.xml    | 12 ------------
 .../android/java/editor/src/main/AndroidManifest.xml | 12 ++++++++++++
 .../java/editor/src/picoos/AndroidManifest.xml       | 12 ------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/platform/android/java/editor/src/horizonos/AndroidManifest.xml b/platform/android/java/editor/src/horizonos/AndroidManifest.xml
index 70453e4922..0a7ca73978 100644
--- a/platform/android/java/editor/src/horizonos/AndroidManifest.xml
+++ b/platform/android/java/editor/src/horizonos/AndroidManifest.xml
@@ -79,18 +79,6 @@
             android:value="quest3|questpro"
             tools:replace="android:value" />
 
-        <!--
-        We remove this meta-data originating from the vendors plugin as we only need the loader for
-        now since the project being edited provides its own version of the vendors plugin.
-
-        This needs to be removed once we start implementing the immersive version of the project
-        manager and editor windows.
-         -->
-        <meta-data
-            android:name="org.godotengine.plugin.v2.GodotOpenXRMeta"
-            android:value="org.godotengine.openxr.vendors.meta.GodotOpenXRMeta"
-            tools:node="remove" />
-
         <!-- Enable system splash screen -->
         <meta-data android:name="com.oculus.ossplash" android:value="true"/>
         <!-- Enable passthrough background during the splash screen -->
diff --git a/platform/android/java/editor/src/main/AndroidManifest.xml b/platform/android/java/editor/src/main/AndroidManifest.xml
index 848eab4409..2e2ff8f838 100644
--- a/platform/android/java/editor/src/main/AndroidManifest.xml
+++ b/platform/android/java/editor/src/main/AndroidManifest.xml
@@ -102,6 +102,18 @@
             android:resizeableActivity="false"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
         </activity>
+
+        <!--
+        We remove this meta-data originating from the vendors plugin as we only need the loader for
+        now since the project being edited provides its own version of the vendors plugin.
+
+        This needs to be removed once we start implementing the immersive version of the project
+        manager and editor windows.
+         -->
+        <meta-data
+            android:name="org.godotengine.plugin.v2.GodotOpenXR"
+            android:value="org.godotengine.openxr.vendors.GodotOpenXR"
+            tools:node="remove" />
     </application>
 
 </manifest>
diff --git a/platform/android/java/editor/src/picoos/AndroidManifest.xml b/platform/android/java/editor/src/picoos/AndroidManifest.xml
index 53a13c09d2..554fec3ebb 100644
--- a/platform/android/java/editor/src/picoos/AndroidManifest.xml
+++ b/platform/android/java/editor/src/picoos/AndroidManifest.xml
@@ -38,18 +38,6 @@
             </intent-filter>
         </activity>
 
-        <!--
-        We remove this meta-data originating from the vendors plugin as we only need the loader for
-        now since the project being edited provides its own version of the vendors plugin.
-
-        This needs to be removed once we start implementing the immersive version of the project
-        manager and editor windows.
-         -->
-        <meta-data
-            android:name="org.godotengine.plugin.v2.GodotOpenXRPico"
-            android:value="org.godotengine.openxr.vendors.pico.GodotOpenXRPico"
-            tools:node="remove"/>
-
         <!-- Enable system splash screen. Passthrough splash screen is not supported yet-->
         <meta-data
             android:name="pvr.app.splash"