Merge pull request #102446 from m4gr3d/export_renderer_project_setting_to_manifest

Export the `rendering/renderer/rendering_method.mobile` project setting to the AndroidManifest
This commit is contained in:
Thaddeus Crews 2025-02-05 10:27:31 -06:00
commit 202fa8e503
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
4 changed files with 15 additions and 1 deletions

View File

@ -3406,6 +3406,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
}
String addons_directory = ProjectSettings::get_singleton()->globalize_path("res://addons");
String current_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
cmdline.push_back("-p"); // argument to specify the start directory.
cmdline.push_back(build_path); // start directory.
@ -3423,6 +3424,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
cmdline.push_back("-Pperform_signing=" + sign_flag); // argument to specify whether the build should be signed.
cmdline.push_back("-Pcompress_native_libraries=" + compress_native_libraries_flag); // argument to specify whether the build should compress native libraries.
cmdline.push_back("-Pgodot_editor_version=" + String(VERSION_FULL_CONFIG));
cmdline.push_back("-Pgodot_rendering_method=" + current_renderer);
// NOTE: The release keystore is not included in the verbose logging
// to avoid accidentally leaking sensitive information when sharing verbose logs for troubleshooting.

View File

@ -33,6 +33,10 @@
<meta-data
android:name="org.godotengine.editor.version"
android:value="${godotEditorVersion}" />
<!-- Records the rendering method used by the Godot engine -->
<meta-data
android:name="org.godotengine.rendering.method"
android:value="${godotRenderingMethod}"/>
<activity
android:name=".GodotApp"

View File

@ -102,7 +102,10 @@ android {
abiFilters export_abi_list
}
manifestPlaceholders = [godotEditorVersion: getGodotEditorVersion()]
manifestPlaceholders = [
godotEditorVersion: getGodotEditorVersion(),
godotRenderingMethod: getGodotRenderingMethod()
]
// Feel free to modify the application id to your own.
applicationId getExportPackageName()

View File

@ -70,6 +70,11 @@ ext.getExportTargetSdkVersion = { ->
}
}
ext.getGodotRenderingMethod = { ->
String renderingMethod = project.hasProperty("godot_rendering_method") ? project.property("godot_rendering_method") : ""
return renderingMethod
}
ext.getGodotEditorVersion = { ->
String editorVersion = project.hasProperty("godot_editor_version") ? project.property("godot_editor_version") : ""
if (editorVersion == null || editorVersion.isEmpty()) {