Merge pull request #49756 from Calinou/android-export-move-clear-prev…

…ious-install-setting Move the Android "clear previous install" setting to Editor Settings
godotengine · Aug 22, 2021 · b4cea10 · b4cea10
2 parents 7560ba8 + 2cdace1
commit b4cea10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
@@ -48,6 +48,8 @@ void register_android_exporter() {
 
  EDITOR_DEF("export/android/shutdown_adb_on_exit", true);
 
+ EDITOR_DEF("export/android/one_click_deploy_clear_previous_install", false);
+
  Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>(memnew(EditorExportPlatformAndroid));
  EditorExport::get_singleton()->add_export_platform(exporter);
 }
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
@@ -1646,8 +1646,6 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
  r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release_user"), ""));
  r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release_password"), ""));
 
- r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "one_click_deploy/clear_previous_install"), false));
-
  r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/code", PROPERTY_HINT_RANGE, "1,4096,1,or_greater"), 1));
  r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "version/name"), "1.0"));
  r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/unique_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "ext.domain.name"), "org.godotengine.$genname"));
@@ -1794,7 +1792,7 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
  int rv;
  String output;
 
- bool remove_prev = p_preset->get("one_click_deploy/clear_previous_install");
+ bool remove_prev = EDITOR_GET("export/android/one_click_deploy_clear_previous_install");
  String version_name = p_preset->get("version/name");
  String package_name = p_preset->get("package/unique_name");