diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-27 22:54:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 22:54:45 +0200 |
| commit | 1a53ee66c16c31bc0f64517f29bdf4b411a5a570 (patch) | |
| tree | e706ee672c49d297d13c572122ffdfa95f253828 | |
| parent | ffe2066bb5470820224185ecad7af257e1cd906c (diff) | |
| parent | c948d25b6e7b57b0c047b6f8af8c0f2e4781f8f5 (diff) | |
Merge pull request #39097 from m4gr3d/validate_plugins_build_config
Validate that `Use Custom Build` is enabled when `Plugins` are selected
| -rw-r--r-- | platform/android/export/export.cpp | 9 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 7 | ||||
| -rw-r--r-- | platform/android/java/build.gradle | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 1bd198ccc0..b678bbb886 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1823,6 +1823,15 @@ public: err += etc_error; } + // Ensure that `Use Custom Build` is enabled if a plugin is selected. + String enabled_plugins_names = get_plugins_names(get_enabled_plugins(p_preset)); + bool custom_build_enabled = p_preset->get("custom_template/use_custom_build"); + if (!enabled_plugins_names.empty() && !custom_build_enabled) { + valid = false; + err += TTR("\"Use Custom Build\" must be enabled to use the plugins."); + err += "\n"; + } + r_error = err; return valid; } diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 5251bc3066..acfdef531e 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -72,17 +72,12 @@ ext.getGodotPluginsRemoteBinaries = { -> /** * Parse the project properties for the 'plugins_local_binaries' property and return * their binaries for inclusion in the build dependencies. - * - * Returns the prebuilt plugins if the 'plugins_local_binaries' property is unavailable. */ ext.getGodotPluginsLocalBinaries = { -> - // Set the prebuilt plugins as default. If custom build is enabled, - // the 'plugins_local_binaries' will be defined so we can use it instead. - Set<String> binDeps = ["libs/plugins/GodotPayment.release.aar"] + Set<String> binDeps = [] // Retrieve the list of local plugins binaries. if (project.hasProperty("plugins_local_binaries")) { - binDeps.clear() String pluginsList = project.property("plugins_local_binaries") if (pluginsList != null && !pluginsList.trim().isEmpty()) { for (String plugin : pluginsList.split(PLUGIN_VALUE_SEPARATOR_REGEX)) { diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index 01a3607b20..80c6be0fae 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -193,4 +193,6 @@ task cleanGodotTemplates(type: Delete) { delete("$binDir/android_source.zip") delete("$binDir/godot-lib.debug.aar") delete("$binDir/godot-lib.release.aar") + + finalizedBy getTasksByName("clean", true) } |