Make UriParser to support [$HOSTNAME] notation.

http://reviews.llvm.org/D12025

llvm-svn: 245639

1 files changed, 18 insertions, 0 deletions

diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
index 213c3b27c6e..f2c7af1421f 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
@@ -16,6 +16,8 @@
 #include "PlatformAndroidRemoteGDBServer.h"
 #include "Utility/UriParser.h"
 
+#include <sstream>
+
 using namespace lldb;
 using namespace lldb_private;
 using namespace platform_android;
@@ -135,3 +137,19 @@ PlatformAndroidRemoteGDBServer::DeleteForwardPort (lldb::pid_t pid)
     }
     m_port_forwards.erase(it);
 }
+
+std::string
+PlatformAndroidRemoteGDBServer::MakeServerUrl(const char* scheme,
+                                              const char* hostname,
+                                              uint16_t port)
+{
+    std::ostringstream hostname_str;
+    if (!strcmp(scheme, "adb"))
+        hostname_str << "[" << hostname << "]";
+    else
+        hostname_str << hostname;
+
+    return PlatformRemoteGDBServer::MakeServerUrl(scheme,
+                                                  hostname_str.str().c_str(),
+                                                  port);
+}