Treat hostname in android URL as device id unless it matches "localhost"

[ovyalov]

Summary

We can connect to a device using various protocols (tcp, unix domain, abstract).
Instead of adding new URL schemes (e.g., adb-unix, adb-abstract) to cover alternative transport we can use standard connect URLs together with device id as hostname, unless it matches "localhost".
If hostname is "localhost" then we expect a single connected device.

[labath]

I like this. (I assume it will work with the tcp-connected devices which have an ID like ???:port)

[ovyalov]

In D14101#275946, @labath wrote:

I like this. (I assume it will work with the tcp-connected devices which have an ID like ???:port)

Yes - definitely.

[ovyalov]

Submitted as http://reviews.llvm.org/rL251422

source/Plugins/Platform/Android/PlatformAndroid.cpp

PlatformAndroid::ConnectRemote(Args& args)
 
     int port;
     std::string scheme, host, path;
     const char *url = args.GetArgumentAtIndex(0);
     if (!url)
         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);
     if (error.Success())
     {
         AdbClient adb;
         error = AdbClient::CreateByDeviceID(m_device_id, adb);
         if (error.Fail())

source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp

PlatformAndroidRemoteGDBServer::ConnectRemote (Args& args)
 
     int remote_port;
     std::string scheme, host, path;
     const char *url = args.GetArgumentAtIndex (0);
     if (!url)
         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;
     auto error = MakeConnectURL (g_remote_platform_pid,
                                  (remote_port < 0) ? 0 : remote_port,
                                  path.c_str (),
                                  connect_url);