From f097defba135dcc8d195019c0ce0e4bf171b07a7 Mon Sep 17 00:00:00 2001 From: fhuya Date: Fri, 18 Oct 2019 09:59:04 -0700 Subject: Re-architecture of the Godot Android plugin. --- editor/export_template_manager.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'editor') diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 12c756122e..9328a5e04d 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -560,13 +560,6 @@ Error ExportTemplateManager::install_android_template() { // Make res://android dir (if it does not exist). da->make_dir("android"); - { - // Add an empty .gdignore file to avoid scan. - FileAccessRef f = FileAccess::open("res://android/.gdignore", FileAccess::WRITE); - ERR_FAIL_COND_V(!f, ERR_CANT_CREATE); - f->store_line(""); - f->close(); - } { // Add version, to ensure building won't work if template and Godot version don't match. FileAccessRef f = FileAccess::open("res://android/.build_version", FileAccess::WRITE); @@ -575,8 +568,19 @@ Error ExportTemplateManager::install_android_template() { f->close(); } - Error err = da->make_dir_recursive("android/build"); + // Create the android plugins directory. + Error err = da->make_dir_recursive("android/plugins"); + ERR_FAIL_COND_V(err != OK, err); + + err = da->make_dir_recursive("android/build"); ERR_FAIL_COND_V(err != OK, err); + { + // Add an empty .gdignore file to avoid scan. + FileAccessRef f = FileAccess::open("res://android/build/.gdignore", FileAccess::WRITE); + ERR_FAIL_COND_V(!f, ERR_CANT_CREATE); + f->store_line(""); + f->close(); + } // Uncompress source template. -- cgit v1.2.3