mirror of
https://github.com/godotengine/godot.git
synced 2026-01-03 18:11:19 +03:00
Update the Android editor flavors to avoid vendor-specific references
This commit is contained in:
@@ -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"
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
@@ -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() {
|
||||
|
||||
@@ -517,6 +517,10 @@ abstract class BaseGodotEditor : GodotActivity() {
|
||||
return isNativeXRDevice();
|
||||
}
|
||||
|
||||
if (featureTag == "horizonos") {
|
||||
return isHorizonOSDevice()
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user