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

Merge pull request #10792 from RandomShaper/fix-android-dbg-pre-21-2.1

Browse Source 
Fix pre-Lollipop Android debug (2.1)
This commit is contained in:
Rémi Verschelde 2017-08-31 11:00:04 +02:00 committed by GitHub
commit 1757ef1d4c
1 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
String id; String id;
String name; String name;
String description; String description;
int release; int api_level;
}; };
Vector<Device> devices; Vector<Device> devices;
@ -1495,7 +1495,7 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
if (ea->devices[j].id == ldevices[i]) { if (ea->devices[j].id == ldevices[i]) {
d.description = ea->devices[j].description; d.description = ea->devices[j].description;
d.name = ea->devices[j].name; d.name = ea->devices[j].name;
d.release = ea->devices[j].release; d.api_level = ea->devices[j].api_level;
} }
} }
@ -1516,7 +1516,7 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
String vendor; String vendor;
String device; String device;
d.description + "Device ID: " + d.id + "\n"; d.description + "Device ID: " + d.id + "\n";
d.release = 0; d.api_level = 0;
for (int j = 0; j < props.size(); j++) { for (int j = 0; j < props.size(); j++) {
String p = props[j]; String p = props[j];
@ -1527,9 +1527,9 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
} else if (p.begins_with("ro.build.display.id=")) { } else if (p.begins_with("ro.build.display.id=")) {
d.description += "Build: " + p.get_slice("=", 1).strip_edges() + "\n"; d.description += "Build: " + p.get_slice("=", 1).strip_edges() + "\n";
} else if (p.begins_with("ro.build.version.release=")) { } else if (p.begins_with("ro.build.version.release=")) {
const String release_str = p.get_slice("=", 1).strip_edges(); d.description += "Release: " + p.get_slice("=", 1).strip_edges() + "\n";
d.description += "Release: " + release_str + "\n"; } else if (p.begins_with("ro.build.version.sdk=")) {
d.release = release_str.to_int(); d.api_level = p.get_slice("=", 1).to_int();
} else if (p.begins_with("ro.product.cpu.abi=")) { } else if (p.begins_with("ro.product.cpu.abi=")) {
d.description += "CPU: " + p.get_slice("=", 1).strip_edges() + "\n"; d.description += "CPU: " + p.get_slice("=", 1).strip_edges() + "\n";
} else if (p.begins_with("ro.product.manufacturer=")) { } else if (p.begins_with("ro.product.manufacturer=")) {
@ -1596,7 +1596,11 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
//export_temp //export_temp
ep.step("Exporting APK", 0); ep.step("Exporting APK", 0);
p_flags |= EXPORT_REMOTE_DEBUG_LOCALHOST; // Needed for adb reverse const bool use_remote = (p_flags & EXPORT_REMOTE_DEBUG) || (p_flags & EXPORT_DUMB_CLIENT);
const bool use_reverse = devices[p_device].api_level >= 21;
if (use_reverse)
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);
@ -1645,40 +1649,54 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
return ERR_CANT_CREATE; return ERR_CANT_CREATE;
} }
args.clear(); if (use_remote) {
args.push_back("-s"); if (use_reverse) {
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);
if (p_flags & EXPORT_REMOTE_DEBUG) { static const char *const msg = "** Device API >= 21; debugging over USB **";
EditorNode::get_singleton()->get_log()->add_message(msg);
print_line(String(msg).to_upper());
int dbg_port = (int)EditorSettings::get_singleton()->get("network/debug_port"); args.clear();
args.clear(); args.push_back("-s");
args.push_back("-s"); args.push_back(devices[p_device].id);
args.push_back(devices[p_device].id); args.push_back("reverse");
args.push_back("reverse"); args.push_back("--remove-all");
args.push_back("tcp:" + itos(dbg_port)); err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
args.push_back("tcp:" + itos(dbg_port));
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); if (p_flags & EXPORT_REMOTE_DEBUG) {
print_line("Reverse result: " + itos(rv));
}
if (p_flags & EXPORT_DUMB_CLIENT) { int dbg_port = (int)EditorSettings::get_singleton()->get("network/debug_port");
args.clear();
args.push_back("-s");
args.push_back(devices[p_device].id);
args.push_back("reverse");
args.push_back("tcp:" + itos(dbg_port));
args.push_back("tcp:" + itos(dbg_port));
int fs_port = EditorSettings::get_singleton()->get("file_server/port"); err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
print_line("Reverse result: " + itos(rv));
}
args.clear(); if (p_flags & EXPORT_DUMB_CLIENT) {
args.push_back("-s");
args.push_back(devices[p_device].id);
args.push_back("reverse");
args.push_back("tcp:" + itos(fs_port));
args.push_back("tcp:" + itos(fs_port));
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); int fs_port = EditorSettings::get_singleton()->get("file_server/port");
print_line("Reverse result2: " + itos(rv));
args.clear();
args.push_back("-s");
args.push_back(devices[p_device].id);
args.push_back("reverse");
args.push_back("tcp:" + itos(fs_port));
args.push_back("tcp:" + itos(fs_port));
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
print_line("Reverse result2: " + itos(rv));
}
} else {
static const char *const msg = "** Device API < 21; debugging over Wi-Fi **";
EditorNode::get_singleton()->get_log()->add_message(msg);
print_line(String(msg).to_upper());
}
} }
ep.step("Running on Device..", 3); ep.step("Running on Device..", 3);
@ -1688,7 +1706,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
args.push_back("shell"); args.push_back("shell");
args.push_back("am"); args.push_back("am");
args.push_back("start"); args.push_back("start");
if (bool(EDITOR_DEF("android/force_system_user", false)) && devices[p_device].release >= 17) { // Multi-user introduced in Android 17 if (bool(EDITOR_DEF("android/force_system_user", false)) && devices[p_device].api_level >= 17) { // Multi-user introduced in Android 17
args.push_back("--user"); args.push_back("--user");
args.push_back("0"); args.push_back("0");
} }