Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #106466 from m4gr3d/misc_build_fixes

Browse source 
[Android] Misc build fixes
This commit is contained in:
Thaddeus Crews 2025-05-16 07:43:08 -05:00
commit 43be1ed01b
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
4 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/android/java/app/build.gradle
View file

@ -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.")
}
}

12
platform/android/java/editor/src/horizonos/AndroidManifest.xml
View file

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

12
platform/android/java/editor/src/main/AndroidManifest.xml
View file

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

12
platform/android/java/editor/src/picoos/AndroidManifest.xml
View file

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