godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Android debug over USB the only option

Browse Source 
'Remote debug over ADB' is removed as that will be always the case.

Closes #10458.
This commit is contained in:
Pedro J. Estébanez 2017-08-22 00:26:35 +02:00
parent e85be2f5df
commit 723e8482c0
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
platform/android/export/export.cpp
View File

@ -1596,11 +1596,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
//export_temp //export_temp
ep.step("Exporting APK", 0); ep.step("Exporting APK", 0);
bool use_adb_over_usb = bool(EDITOR_DEF("android/use_remote_debug_over_adb", true)); p_flags |= EXPORT_REMOTE_DEBUG_LOCALHOST; // Needed for adb reverse
if (use_adb_over_usb) {
p_flags |= EXPORT_REMOTE_DEBUG_LOCALHOST;
}
String export_to = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpexport.apk"; String export_to = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpexport.apk";
Error err = export_project(export_to, true, p_flags); Error err = export_project(export_to, true, p_flags);
@ -1649,14 +1645,14 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
return ERR_CANT_CREATE; return ERR_CANT_CREATE;
} }
if (use_adb_over_usb) { args.clear();
args.push_back("-s");
args.push_back(devices[p_device].id);
args.push_back("reverse");
args.push_back("--remove-all");
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
args.clear(); if (p_flags & EXPORT_REMOTE_DEBUG) {
args.push_back("-s");
args.push_back(devices[p_device].id);
args.push_back("reverse");
args.push_back("--remove-all");
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
int dbg_port = (int)EditorSettings::get_singleton()->get("network/debug_port"); int dbg_port = (int)EditorSettings::get_singleton()->get("network/debug_port");
args.clear(); args.clear();
@ -1668,6 +1664,9 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
print_line("Reverse result: " + itos(rv)); print_line("Reverse result: " + itos(rv));
}
if (p_flags & EXPORT_DUMB_CLIENT) {
int fs_port = EditorSettings::get_singleton()->get("file_server/port"); int fs_port = EditorSettings::get_singleton()->get("file_server/port");
@ -1847,7 +1846,6 @@ void register_android_exporter() {
//EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore")); //EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore"));
EDITOR_DEF("android/force_system_user", false); EDITOR_DEF("android/force_system_user", false);
EDITOR_DEF("android/timestamping_authority_url", ""); EDITOR_DEF("android/timestamping_authority_url", "");
EDITOR_DEF("android/use_remote_debug_over_adb", false);
EDITOR_DEF("android/shutdown_adb_on_exit", true); EDITOR_DEF("android/shutdown_adb_on_exit", true);
Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>(memnew(EditorExportPlatformAndroid)); Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>(memnew(EditorExportPlatformAndroid));