godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Deprecate and remove vendors specific XR APIs from the Godot core Android library

Browse Source 
Follow-up to https://github.com/GodotVR/godot_openxr_vendors/pull/380, done in order to prevent vendors specific dependencies onto the Godot core Android library.
This commit is contained in:
Fredia Huya-Kouadio
2025-10-20 19:36:22 -07:00
committed by Fredia Huya-Kouadio
parent 9dd6c4dbac
commit 023024440b
13 changed files with 54 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/android/java_godot_wrapper.cpp
View File

@@ -80,7 +80,7 @@ GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_godot_instance) {
_end_benchmark_measure = p_env->GetMethodID(godot_class, "nativeEndBenchmarkMeasure", "(Ljava/lang/String;Ljava/lang/String;)V");
_dump_benchmark = p_env->GetMethodID(godot_class, "nativeDumpBenchmark", "(Ljava/lang/String;)V");
_get_gdextension_list_config_file = p_env->GetMethodID(godot_class, "getGDExtensionConfigFiles", "()[Ljava/lang/String;");
_has_feature = p_env->GetMethodID(godot_class, "hasFeature", "(Ljava/lang/String;)Z");
_check_internal_feature_support = p_env->GetMethodID(godot_class, "checkInternalFeatureSupport", "(Ljava/lang/String;)Z");
_sign_apk = p_env->GetMethodID(godot_class, "nativeSignApk", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I");
_verify_apk = p_env->GetMethodID(godot_class, "nativeVerifyApk", "(Ljava/lang/String;)I");
_enable_immersive_mode = p_env->GetMethodID(godot_class, "nativeEnableImmersiveMode", "(Z)V");
@@ -517,13 +517,13 @@ void GodotJavaWrapper::dump_benchmark(const String &benchmark_file) {
}
}
bool GodotJavaWrapper::has_feature(const String &p_feature) const {
if (_has_feature) {
bool GodotJavaWrapper::check_internal_feature_support(const String &p_feature) const {
if (_check_internal_feature_support) {
JNIEnv *env = get_jni_env();
ERR_FAIL_NULL_V(env, false);
jstring j_feature = env->NewStringUTF(p_feature.utf8().get_data());
bool result = env->CallBooleanMethod(godot_instance, _has_feature, j_feature);
bool result = env->CallBooleanMethod(godot_instance, _check_internal_feature_support, j_feature);
env->DeleteLocalRef(j_feature);
return result;
} else {