Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export the rendering/renderer/rendering_method.mobile project setting to the AndroidManifest #102446

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Export the rendering/renderer/rendering_method.mobile project setting to the AndroidManifest #102446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions platform/android/export/export_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions platform/android/java/app/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion platform/android/java/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 5 additions & 0 deletions platform/android/java/app/config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down