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

Pass the correct export_format argument to locate the assets directory when exporting.

Browse Source 
(cherry picked from commit 431ccdb057)
This commit is contained in:
ne0fhyk
2021-10-11 08:02:03 -07:00
committed by Rémi Verschelde
parent df1eebd8d8
commit 754db65a1f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/android/export/export_plugin.cpp
View File

@@ -433,9 +433,8 @@ String EditorExportPlatformAndroid::get_package_name(const String &p_package) co
return pname; return pname;
} }
String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportPreset> &p_preset) const { String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportPreset> &p_preset, int p_export_format) const {
int export_format = int(p_preset->get("custom_template/export_format")); return p_export_format == EXPORT_FORMAT_AAB ? AAB_ASSETS_DIRECTORY : APK_ASSETS_DIRECTORY;
return export_format == EXPORT_FORMAT_AAB ? AAB_ASSETS_DIRECTORY : APK_ASSETS_DIRECTORY;
} }
bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package, String *r_error) const { bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package, String *r_error) const {
@@ -2808,7 +2807,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
return ERR_UNCONFIGURED; return ERR_UNCONFIGURED;
} }
} }
const String assets_directory = get_assets_directory(p_preset); const String assets_directory = get_assets_directory(p_preset, export_format);
String sdk_path = EDITOR_GET("export/android/android_sdk_path"); String sdk_path = EDITOR_GET("export/android/android_sdk_path");
ERR_FAIL_COND_V_MSG(sdk_path.empty(), ERR_UNCONFIGURED, "Android SDK path must be configured in Editor Settings at 'export/android/android_sdk_path'."); ERR_FAIL_COND_V_MSG(sdk_path.empty(), ERR_UNCONFIGURED, "Android SDK path must be configured in Editor Settings at 'export/android/android_sdk_path'.");
print_verbose("Android sdk path: " + sdk_path); print_verbose("Android sdk path: " + sdk_path);

2
platform/android/export/export_plugin.h
View File

@@ -104,7 +104,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
String get_package_name(const String &p_package) const; String get_package_name(const String &p_package) const;
String get_assets_directory(const Ref<EditorExportPreset> &p_preset) const; String get_assets_directory(const Ref<EditorExportPreset> &p_preset, int p_export_format) const;
bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const; bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const;