diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-27 11:19:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 11:19:40 +0200 |
| commit | f3fbb157cad78185e20886568c26dc533cca7d0f (patch) | |
| tree | cbf61b36e381993a110272a19a5e7e7641d8ec0b /platform/android | |
| parent | a7335b00e6f8da4e7491afeb0c7547d95e9541f4 (diff) | |
| parent | 006e5f28d58c516d2331a48842665289e2ba9fcf (diff) | |
Merge pull request #63121 from aaronfranke/editor-export-split
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/export/export.cpp | 4 | ||||
| -rw-r--r-- | platform/android/export/export_plugin.h | 2 | ||||
| -rw-r--r-- | platform/android/export/gradle_export_util.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 560f188b82..5bbe0ffab6 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -30,10 +30,10 @@ #include "export.h" -#include "export_plugin.h" - #include "core/os/os.h" #include "editor/editor_settings.h" +#include "editor/export/editor_export.h" +#include "export_plugin.h" void register_android_exporter() { EDITOR_DEF("export/android/android_sdk_path", ""); diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h index 15ac8091be..8fd2f0680d 100644 --- a/platform/android/export/export_plugin.h +++ b/platform/android/export/export_plugin.h @@ -35,7 +35,7 @@ #include "core/io/zip_io.h" #include "core/os/os.h" -#include "editor/editor_export.h" +#include "editor/export/editor_export_platform.h" const String SPLASH_CONFIG_XML_CONTENT = R"SPLASH(<?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/platform/android/export/gradle_export_util.h b/platform/android/export/gradle_export_util.h index 018ae649d6..232b4458c6 100644 --- a/platform/android/export/gradle_export_util.h +++ b/platform/android/export/gradle_export_util.h @@ -35,7 +35,7 @@ #include "core/io/file_access.h" #include "core/io/zip_io.h" #include "core/os/os.h" -#include "editor/editor_export.h" +#include "editor/export/editor_export.h" const String godot_project_name_xml_string = R"(<?xml version="1.0" encoding="utf-8"?> <!--WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME--> |