diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-03-20 18:34:05 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-03-20 18:34:05 +0100 |
| commit | a895e2e372c9df2a9972f38134ae0ea9c8bf45a8 (patch) | |
| tree | dbf7562a03749e587f0e08d3ebbcf4b479e9962d /platform/android/export/export.cpp | |
| parent | d4321c9f3363674360eac275805166e416418dca (diff) | |
| parent | c58494038702876403687e5b76a100f077b8d9b3 (diff) | |
Merge pull request #4105 from akien-mga/pr-android-shutdown-adb
Expose android/shutdown_adb_on_exit parameter
Diffstat (limited to 'platform/android/export/export.cpp')
| -rw-r--r-- | platform/android/export/export.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index e65a712a17..60f4e61c68 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1772,6 +1772,7 @@ void register_android_exporter() { //EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore")); EDITOR_DEF("android/timestamping_authority_url",""); EDITOR_DEF("android/use_remote_debug_over_adb",false); + EDITOR_DEF("android/shutdown_adb_on_exit",true); Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) ); EditorImportExport::get_singleton()->add_export_platform(exporter); |