Update the Android editor flavors to avoid vendor-specific references

This commit is contained in:
Fredia Huya-Kouadio
2024-09-13 08:53:29 -07:00
parent 74de05a01c
commit 741efa632a
10 changed files with 32 additions and 28 deletions

View File

@@ -145,14 +145,14 @@ android {
}
}
flavorDimensions = ["vendor"]
flavorDimensions = ["android_distribution"]
productFlavors {
google {
dimension "vendor"
android {
dimension "android_distribution"
missingDimensionStrategy 'products', 'editor'
}
meta {
dimension "vendor"
horizonos {
dimension "android_distribution"
missingDimensionStrategy 'products', 'editor'
ndk {
//noinspection ChromeOsAbiSupport
@@ -176,5 +176,5 @@ dependencies {
implementation "org.bouncycastle:bcprov-jdk15to18:1.77"
// Meta dependencies
metaImplementation "org.godotengine:godot-openxr-vendors-meta:3.0.0-stable"
horizonosImplementation "org.godotengine:godot-openxr-vendors-meta:3.0.0-stable"
}

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -36,7 +36,7 @@ import org.godotengine.godot.utils.isNativeXRDevice
/**
* Primary window of the Godot Editor.
*
* This is the implementation of the editor used when running on Meta devices.
* This is the implementation of the editor used when running on HorizonOS devices.
*/
open class GodotEditor : BaseGodotEditor() {

View File

@@ -517,6 +517,10 @@ abstract class BaseGodotEditor : GodotActivity() {
return isNativeXRDevice();
}
if (featureTag == "horizonos") {
return isHorizonOSDevice()
}
return false
}
}