[Lldb-commits] [lldb] r251044 - Set device_id to host value only in case of adb protocol.

[Oleksiy Vyalov via lldb-commits]

Author: ovyalov
Date: Thu Oct 22 14:17:32 2015
New Revision: 251044

URL: http://llvm.org/viewvc/llvm-project?rev=251044&view=rev
Log:
Set device_id to host value only in case of adb protocol.

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=251044&r1=251043&r2=251044&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp Thu Oct 22 14:17:32 2015
@@ -196,7 +196,8 @@ PlatformAndroid::ConnectRemote(Args& arg
         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())

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=251044&r1=251043&r2=251044&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp Thu Oct 22 14:17:32 2015
@@ -126,7 +126,8 @@ PlatformAndroidRemoteGDBServer::ConnectR
         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,