Set device_id to host value only in case of adb protocol.

llvm-svn: 251044

diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
index 0706c9b..403e641 100644 (file)
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
@@ -196,7 +196,8 @@ PlatformAndroid::ConnectRemote(Args& args)
         return Error("URL is null.");
     if (!UriParser::Parse(url, scheme, host, port, path))
         return Error("Invalid URL: %s", url);
-    m_device_id = host;
+    if (scheme == "adb")
+        m_device_id = host;
 
     auto error = PlatformLinux::ConnectRemote(args);
     if (error.Success())

diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
index 1abc708..01b0ffa 100644 (file)
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
@@ -126,7 +126,8 @@ PlatformAndroidRemoteGDBServer::ConnectRemote (Args& args)
         return Error("URL is null.");
     if (!UriParser::Parse (url, scheme, host, remote_port, path))
         return Error("Invalid URL: %s", url);
-    m_device_id = host;
+    if (scheme == "adb")
+        m_device_id = host;
 
     std::string connect_url;
     auto error = MakeConnectURL (g_remote_platform_pid,