Pass the correct export_format argument to locate the assets directory when exporting
#53677
+4
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
m4gr3d
added
bug
platform:android
topic:buildsystem
cherrypick:3.x
akien-mga
reviewed
Oct 11, 2021
| @@ -429,8 +429,7 @@ String EditorExportPlatformAndroid::get_package_name(const String &p_package) co | |||
| return pname; | |||
| } | |||
|
|
|||
| String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportPreset> &p_preset) const { | |||
| int export_format = int(p_preset->get("custom_template/export_format")); | |||
| String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportPreset> &p_preset, int export_format) const { | |||
There was a problem hiding this comment.
Suggested change
| String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportPreset> &p_preset, int export_format) const { | |
| String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportPreset> &p_preset, int p_export_format) const { |
There was a problem hiding this comment.
Nevermind, there's already EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int export_format, bool should_sign, int p_flags) as signature so it's not strictly needed to change in this PR.
akien-mga
approved these changes
Oct 11, 2021
…ory when exporting.
m4gr3d
force-pushed
the
fix_aab_one_click_deploy_master
branch
from
4a05aca
to
431ccdb
Compare
|
Thanks! |
|
Cherry-picked for 3.4. |
akien-mga
removed
the
cherrypick:3.x
|
I have this problem. You were able to solve it ? |
|
Godot v3.4.rc3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #53328