diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-16 09:59:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 09:59:27 +0100 |
| commit | dc06ee15b750b9c887f83ffc1b9d4a39806af947 (patch) | |
| tree | 86e9d1f4f4926f2285ab13e3b8389d5bd53a1db7 /editor | |
| parent | 94875f5f481d17fce4db68b44ecd657afbe9d66e (diff) | |
| parent | 20bca313c0266d5d5508801f7b9b809fc26c2092 (diff) | |
Merge pull request #43481 from nathanfranke/android-export-fix
Fix Android Export jarsigner error with *.import whitelist
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_export.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 97800fe961..3aeffede82 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -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_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. bool enc_pck = p_preset->get_enc_pck(); Vector<String> enc_in_filters; |