Author: ovyalov Date: Tue Oct 27 12:41:34 2015 New Revision: 251422 URL: http://llvm.org/viewvc/llvm-project?rev=251422&view=rev Log: Treat hostname in android URL as device id unless it matches "localhost".
http://reviews.llvm.org/D14101 Modified: lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp Modified: lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp?rev=251422&r1=251421&r2=251422&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp (original) +++ lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp Tue Oct 27 12:41:34 2015 @@ -196,7 +196,7 @@ PlatformAndroid::ConnectRemote(Args& arg return Error("URL is null."); if (!UriParser::Parse(url, scheme, host, port, path)) return Error("Invalid URL: %s", url); - if (scheme == "adb") + if (host != "localhost") m_device_id = host; auto error = PlatformLinux::ConnectRemote(args); Modified: lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp?rev=251422&r1=251421&r2=251422&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp (original) +++ lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp Tue Oct 27 12:41:34 2015 @@ -126,7 +126,7 @@ PlatformAndroidRemoteGDBServer::ConnectR return Error("URL is null."); if (!UriParser::Parse (url, scheme, host, remote_port, path)) return Error("Invalid URL: %s", url); - if (scheme == "adb") + if (host != "localhost") m_device_id = host; std::string connect_url; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
