1 files changed, 14 insertions, 79 deletions

diff --git a/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h b/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
index ccdce9874762..975f50b421f1 100644
--- a/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
+++ b/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
@@ -16,16 +16,16 @@
 
 // Other libraries and framework includes
 // Project includes
-#include "PlatformDarwin.h"
+#include "PlatformRemoteDarwinDevice.h"
 #include "lldb/Utility/FileSpec.h"
 
 #include "llvm/Support/FileSystem.h"
 
-class PlatformRemoteiOS : public PlatformDarwin {
+class PlatformRemoteiOS : public PlatformRemoteDarwinDevice {
 public:
   PlatformRemoteiOS();
 
-  ~PlatformRemoteiOS() override;
+  ~PlatformRemoteiOS() override = default;
 
   //------------------------------------------------------------
   // Class Functions
@@ -42,6 +42,12 @@ public:
   static const char *GetDescriptionStatic();
 
   //------------------------------------------------------------
+  // lldb_private::Platform functions
+  //------------------------------------------------------------
+
+  const char *GetDescription() override { return GetDescriptionStatic(); }
+
+  //------------------------------------------------------------
   // lldb_private::PluginInterface functions
   //------------------------------------------------------------
   lldb_private::ConstString GetPluginName() override {
@@ -50,89 +56,18 @@ public:
 
   uint32_t GetPluginVersion() override { return 1; }
 
-  //------------------------------------------------------------
-  // lldb_private::Platform functions
-  //------------------------------------------------------------
-  lldb_private::Error ResolveExecutable(
-      const lldb_private::ModuleSpec &module_spec, lldb::ModuleSP &module_sp,
-      const lldb_private::FileSpecList *module_search_paths_ptr) override;
-
-  const char *GetDescription() override { return GetDescriptionStatic(); }
-
-  void GetStatus(lldb_private::Stream &strm) override;
-
-  virtual lldb_private::Error
-  GetSymbolFile(const lldb_private::FileSpec &platform_file,
-                const lldb_private::UUID *uuid_ptr,
-                lldb_private::FileSpec &local_file);
-
-  lldb_private::Error
-  GetSharedModule(const lldb_private::ModuleSpec &module_spec,
-                  lldb_private::Process *process, lldb::ModuleSP &module_sp,
-                  const lldb_private::FileSpecList *module_search_paths_ptr,
-                  lldb::ModuleSP *old_module_sp_ptr,
-                  bool *did_create_ptr) override;
-
   bool GetSupportedArchitectureAtIndex(uint32_t idx,
                                        lldb_private::ArchSpec &arch) override;
 
-  void
-  AddClangModuleCompilationOptions(lldb_private::Target *target,
-                                   std::vector<std::string> &options) override {
-    return PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
-        target, options, PlatformDarwin::SDKType::iPhoneOS);
-  }
-
 protected:
-  struct SDKDirectoryInfo {
-    SDKDirectoryInfo(const lldb_private::FileSpec &sdk_dir_spec);
-    lldb_private::FileSpec directory;
-    lldb_private::ConstString build;
-    uint32_t version_major;
-    uint32_t version_minor;
-    uint32_t version_update;
-    bool user_cached;
-  };
-
-  typedef std::vector<SDKDirectoryInfo> SDKDirectoryInfoCollection;
-
-  std::mutex m_sdk_dir_mutex;
-  SDKDirectoryInfoCollection m_sdk_directory_infos;
-  std::string m_device_support_directory;
-  std::string m_device_support_directory_for_os_version;
-  std::string m_build_update;
-  uint32_t m_last_module_sdk_idx;
-  uint32_t m_connected_module_sdk_idx;
-
-  bool UpdateSDKDirectoryInfosIfNeeded();
-
-  const char *GetDeviceSupportDirectory();
-
-  const char *GetDeviceSupportDirectoryForOSVersion();
 
-  const SDKDirectoryInfo *GetSDKDirectoryForLatestOSVersion();
-
-  const SDKDirectoryInfo *GetSDKDirectoryForCurrentOSVersion();
-
-  static lldb_private::FileSpec::EnumerateDirectoryResult
-  GetContainedFilesIntoVectorOfStringsCallback(
-      void *baton, llvm::sys::fs::file_type ft,
-      const lldb_private::FileSpec &file_spec);
-
-  uint32_t FindFileInAllSDKs(const char *platform_file_path,
-                             lldb_private::FileSpecList &file_list);
-
-  bool GetFileInSDK(const char *platform_file_path, uint32_t sdk_idx,
-                    lldb_private::FileSpec &local_file);
-
-  uint32_t FindFileInAllSDKs(const lldb_private::FileSpec &platform_file,
-                             lldb_private::FileSpecList &file_list);
+  //------------------------------------------------------------
+  // lldb_private::PlatformRemoteDarwinDevice functions
+  //------------------------------------------------------------
 
-  uint32_t GetConnectedSDKIndex();
+  void GetDeviceSupportDirectoryNames (std::vector<std::string> &dirnames) override;
 
-  // Get index of SDK in SDKDirectoryInfoCollection by its pointer and return
-  // UINT32_MAX if that SDK not found.
-  uint32_t GetSDKIndexBySDKDirectoryInfo(const SDKDirectoryInfo *sdk_info);
+  std::string GetPlatformName () override;
 
 private:
   DISALLOW_COPY_AND_ASSIGN(PlatformRemoteiOS);