godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43481 from nathanfranke/android-export-fix

Browse Source 
Fix Android Export jarsigner error with *.import whitelist
This commit is contained in:
Rémi Verschelde 2020-11-16 09:59:27 +01:00 committed by GitHub
commit dc06ee15b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_export.cpp
View File

@ -737,6 +737,9 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
_edit_filter_list(paths, p_preset->get_include_filter(), false); _edit_filter_list(paths, p_preset->get_include_filter(), false);
_edit_filter_list(paths, p_preset->get_exclude_filter(), true); _edit_filter_list(paths, p_preset->get_exclude_filter(), true);
// Ignore import files, since these are automatically added to the jar later with the resources
_edit_filter_list(paths, String("*.import"), true);
// Get encryption filters. // Get encryption filters.
bool enc_pck = p_preset->get_enc_pck(); bool enc_pck = p_preset->get_enc_pck();
Vector<String> enc_in_filters; Vector<String> enc_in_filters;