diff options
Diffstat (limited to 'lldb/source/Plugins/Platform/Android')
6 files changed, 28 insertions, 14 deletions
diff --git a/lldb/source/Plugins/Platform/Android/AdbClient.cpp b/lldb/source/Plugins/Platform/Android/AdbClient.cpp index d3d5878380b..f9540650a6e 100644 --- a/lldb/source/Plugins/Platform/Android/AdbClient.cpp +++ b/lldb/source/Plugins/Platform/Android/AdbClient.cpp @@ -20,6 +20,7 @@ using namespace lldb; using namespace lldb_private; +using namespace lldb_private::platform_android; namespace { diff --git a/lldb/source/Plugins/Platform/Android/AdbClient.h b/lldb/source/Plugins/Platform/Android/AdbClient.h index f372b244021..3dcc0068596 100644 --- a/lldb/source/Plugins/Platform/Android/AdbClient.h +++ b/lldb/source/Plugins/Platform/Android/AdbClient.h @@ -24,6 +24,7 @@ #include "lldb/Host/ConnectionFileDescriptor.h" namespace lldb_private { +namespace platform_android { class AdbClient { @@ -71,6 +72,7 @@ private: ConnectionFileDescriptor m_conn; }; +} // namespace platform_android } // namespace lldb_private #endif // liblldb_AdbClient_h_ diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp index e339e03db6d..7bc3287d035 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp @@ -21,6 +21,7 @@ using namespace lldb; using namespace lldb_private; +using namespace lldb_private::platform_android; static uint32_t g_initialize_count = 0; @@ -59,7 +60,7 @@ PlatformAndroid::Terminate () PlatformSP PlatformAndroid::CreateInstance (bool force, const ArchSpec *arch) { - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PLATFORM)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_PLATFORM)); if (log) { const char *arch_name; @@ -139,7 +140,7 @@ PlatformAndroid::~PlatformAndroid() { } -lldb_private::ConstString +ConstString PlatformAndroid::GetPluginNameStatic (bool is_host) { if (is_host) @@ -163,7 +164,7 @@ PlatformAndroid::GetPluginDescriptionStatic (bool is_host) return "Remote Android user platform plug-in."; } -lldb_private::ConstString +ConstString PlatformAndroid::GetPluginName() { return GetPluginNameStatic(IsHost()); diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.h b/lldb/source/Plugins/Platform/Android/PlatformAndroid.h index 08b3a027072..9b0a37ba232 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.h +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.h @@ -20,8 +20,9 @@ #include "Plugins/Platform/Linux/PlatformLinux.h" namespace lldb_private { +namespace platform_android { - class PlatformAndroid : public PlatformLinux + class PlatformAndroid : public platform_linux::PlatformLinux { public: static void @@ -39,15 +40,15 @@ namespace lldb_private { // lldb_private::PluginInterface functions //------------------------------------------------------------ static lldb::PlatformSP - CreateInstance (bool force, const lldb_private::ArchSpec *arch); + CreateInstance (bool force, const ArchSpec *arch); - static lldb_private::ConstString + static ConstString GetPluginNameStatic (bool is_host); static const char * GetPluginDescriptionStatic (bool is_host); - lldb_private::ConstString + ConstString GetPluginName() override; uint32_t @@ -60,8 +61,8 @@ namespace lldb_private { // lldb_private::Platform functions //------------------------------------------------------------ - lldb_private::Error - ConnectRemote (lldb_private::Args& args) override; + Error + ConnectRemote (Args& args) override; protected: const char * @@ -71,6 +72,8 @@ namespace lldb_private { std::string m_device_id; DISALLOW_COPY_AND_ASSIGN (PlatformAndroid); }; + +} // namespace platofor_android } // namespace lldb_private #endif // liblldb_PlatformAndroid_h_ diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp index b3c0ff4b12c..bb030f241fe 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp @@ -18,13 +18,14 @@ using namespace lldb; using namespace lldb_private; +using namespace platform_android; static const lldb::pid_t g_remote_platform_pid = 0; // Alias for the process id of lldb-platform static Error ForwardPortWithAdb (uint16_t port, std::string& device_id) { - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PLATFORM)); + Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_PLATFORM)); // Fetch the device list from ADB and if only 1 device found then use that device // TODO: Handle the case when more device is available diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h index 19295810b1f..0cac44cbf79 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h @@ -19,7 +19,10 @@ // Project includes #include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h" -class PlatformAndroidRemoteGDBServer : public PlatformRemoteGDBServer +namespace lldb_private { +namespace platform_android { + +class PlatformAndroidRemoteGDBServer : public platform_gdb_server::PlatformRemoteGDBServer { public: PlatformAndroidRemoteGDBServer (); @@ -27,10 +30,10 @@ public: virtual ~PlatformAndroidRemoteGDBServer (); - lldb_private::Error - ConnectRemote (lldb_private::Args& args) override; + Error + ConnectRemote (Args& args) override; - lldb_private::Error + Error DisconnectRemote () override; protected: @@ -47,4 +50,7 @@ private: }; +} // namespace platform_android +} // namespace lldb_private + #endif // liblldb_PlatformAndroidRemoteGDBServer_h_ |
