maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 251044
This commit is contained in:
Oleksiy Vyalov 2015-10-22 19:17:32 +00:00
parent c4aaed9255
commit 92b14b9f71
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
View File

@ -196,6 +196,7 @@ PlatformAndroid::ConnectRemote(Args& args)
return Error("URL is null."); return Error("URL is null.");
if (!UriParser::Parse(url, scheme, host, port, path)) if (!UriParser::Parse(url, scheme, host, port, path))
return Error("Invalid URL: %s", url); return Error("Invalid URL: %s", url);
if (scheme == "adb")
m_device_id = host; m_device_id = host;
auto error = PlatformLinux::ConnectRemote(args); auto error = PlatformLinux::ConnectRemote(args);

1
lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
View File

@ -126,6 +126,7 @@ PlatformAndroidRemoteGDBServer::ConnectRemote (Args& args)
return Error("URL is null."); return Error("URL is null.");
if (!UriParser::Parse (url, scheme, host, remote_port, path)) if (!UriParser::Parse (url, scheme, host, remote_port, path))
return Error("Invalid URL: %s", url); return Error("Invalid URL: %s", url);
if (scheme == "adb")
m_device_id = host; m_device_id = host;
std::string connect_url; std::string connect_url;