Skip to content

Commit 1b0bd35

Browse files
committed
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.
1 parent 773fc96 commit 1b0bd35

File tree

3 files changed

+12
-24
lines changed

3 files changed

+12
-24
lines changed

platform/android/java/editor/src/horizonos/AndroidManifest.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,6 @@
7979
android:value="quest3|questpro"
8080
tools:replace="android:value" />
8181

82-
<!--
83-
We remove this meta-data originating from the vendors plugin as we only need the loader for
84-
now since the project being edited provides its own version of the vendors plugin.
85-
86-
This needs to be removed once we start implementing the immersive version of the project
87-
manager and editor windows.
88-
-->
89-
<meta-data
90-
android:name="org.godotengine.plugin.v2.GodotOpenXRMeta"
91-
android:value="org.godotengine.openxr.vendors.meta.GodotOpenXRMeta"
92-
tools:node="remove" />
93-
9482
<!-- Enable system splash screen -->
9583
<meta-data android:name="com.oculus.ossplash" android:value="true"/>
9684
<!-- Enable passthrough background during the splash screen -->

platform/android/java/editor/src/main/AndroidManifest.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,18 @@
102102
android:resizeableActivity="false"
103103
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
104104
</activity>
105+
106+
<!--
107+
We remove this meta-data originating from the vendors plugin as we only need the loader for
108+
now since the project being edited provides its own version of the vendors plugin.
109+
110+
This needs to be removed once we start implementing the immersive version of the project
111+
manager and editor windows.
112+
-->
113+
<meta-data
114+
android:name="org.godotengine.plugin.v2.GodotOpenXR"
115+
android:value="org.godotengine.openxr.vendors.GodotOpenXR"
116+
tools:node="remove" />
105117
</application>
106118

107119
</manifest>

platform/android/java/editor/src/picoos/AndroidManifest.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,6 @@
3838
</intent-filter>
3939
</activity>
4040

41-
<!--
42-
We remove this meta-data originating from the vendors plugin as we only need the loader for
43-
now since the project being edited provides its own version of the vendors plugin.
44-
45-
This needs to be removed once we start implementing the immersive version of the project
46-
manager and editor windows.
47-
-->
48-
<meta-data
49-
android:name="org.godotengine.plugin.v2.GodotOpenXRPico"
50-
android:value="org.godotengine.openxr.vendors.pico.GodotOpenXRPico"
51-
tools:node="remove"/>
52-
5341
<!-- Enable system splash screen. Passthrough splash screen is not supported yet-->
5442
<meta-data
5543
android:name="pvr.app.splash"

0 commit comments

Comments
 (0)