Update the way SDK directories are found so we are not reliant on the old "Latest" symlinks in the DeviceSupport directory.

llvm-svn: 154966

1 files changed, 32 insertions, 1 deletions

diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
index 051b5846dc8..4991016c0cc 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
@@ -13,6 +13,8 @@
 // C Includes
 // C++ Includes
 // Other libraries and framework includes
+#include "lldb/Host/FileSpec.h"
+
 // Project includes
 #include "PlatformDarwin.h"
 
@@ -113,13 +115,42 @@ public:
                                      lldb_private::ArchSpec &arch);
 
 protected:
+    struct SDKDirectoryInfo
+    {
+        SDKDirectoryInfo (const lldb_private::ConstString &dirname);
+        lldb_private::ConstString directory;
+        lldb_private::ConstString build;
+        uint32_t version_major;
+        uint32_t version_minor;
+        uint32_t version_update;
+    };
+    typedef std::vector<SDKDirectoryInfo> SDKDirectoryInfoCollection;
+    std::string m_device_support_directory;
+    SDKDirectoryInfoCollection m_sdk_directory_infos;
     std::string m_device_support_directory_for_os_version;
     std::string m_build_update;
     //std::vector<FileSpec> m_device_support_os_dirs;
-    
+
+    bool
+    UpdateSDKDirectoryInfosInNeeded();
+
+    const char *
+    GetDeviceSupportDirectory();
+
     const char *
     GetDeviceSupportDirectoryForOSVersion();
 
+    const SDKDirectoryInfo *
+    GetSDKDirectoryForLatestOSVersion ();
+
+    const SDKDirectoryInfo *
+    GetSDKDirectoryForCurrentOSVersion ();
+
+    static lldb_private::FileSpec::EnumerateDirectoryResult
+    GetContainedFilesIntoVectorOfStringsCallback (void *baton,
+                                                  lldb_private::FileSpec::FileType file_type,
+                                                  const lldb_private::FileSpec &file_spec);
+
 private:
     DISALLOW_COPY_AND_ASSIGN (PlatformRemoteiOS);