Reverted r232883 due to failing tests.

llvm-svn: 232904

diff --git a/lldb/include/lldb/Host/android/HostInfoAndroid.h b/lldb/include/lldb/Host/android/HostInfoAndroid.h
index 4132116..ed9d3ee 100644 (file)
--- a/lldb/include/lldb/Host/android/HostInfoAndroid.h
+++ b/lldb/include/lldb/Host/android/HostInfoAndroid.h
@@ -25,6 +25,7 @@ class HostInfoAndroid : public HostInfoLinux
 
   protected:
     static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);
+    static bool ComputeSupportExeDirectory(FileSpec &file_spec);
 };
 
 } // end of namespace lldb_private

diff --git a/lldb/include/lldb/Host/linux/HostInfoLinux.h b/lldb/include/lldb/Host/linux/HostInfoLinux.h
index e4b2207..4596b33 100644 (file)
--- a/lldb/include/lldb/Host/linux/HostInfoLinux.h
+++ b/lldb/include/lldb/Host/linux/HostInfoLinux.h
@@ -40,7 +40,7 @@ class HostInfoLinux : public HostInfoPosix
     static FileSpec GetProgramFileSpec();
 
   protected:
-    static bool ComputeSupportExeDirectory(FileSpec &file_spec);
+    static bool ComputeSharedLibraryDirectory(FileSpec &file_spec);
     static bool ComputeSystemPluginsDirectory(FileSpec &file_spec);
     static bool ComputeUserPluginsDirectory(FileSpec &file_spec);
     static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);

diff --git a/lldb/source/Host/android/HostInfoAndroid.cpp b/lldb/source/Host/android/HostInfoAndroid.cpp
index f44b6c6..b819f92 100644 (file)
--- a/lldb/source/Host/android/HostInfoAndroid.cpp
+++ b/lldb/source/Host/android/HostInfoAndroid.cpp
@@ -30,6 +30,13 @@ HostInfoAndroid::ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arc
     }
 }
 
+bool
+HostInfoAndroid::ComputeSupportExeDirectory(FileSpec &file_spec)
+{
+    file_spec.GetDirectory() = HostInfoLinux::GetProgramFileSpec().GetDirectory();
+    return (bool)file_spec.GetDirectory();
+}
+
 FileSpec
 HostInfoAndroid::GetDefaultShell()
 {

diff --git a/lldb/source/Host/linux/HostInfoLinux.cpp b/lldb/source/Host/linux/HostInfoLinux.cpp
index d5f88fe..3c192dc 100644 (file)
--- a/lldb/source/Host/linux/HostInfoLinux.cpp
+++ b/lldb/source/Host/linux/HostInfoLinux.cpp
@@ -222,10 +222,12 @@ HostInfoLinux::GetProgramFileSpec()
 }
 
 bool
-HostInfoLinux::ComputeSupportExeDirectory(FileSpec &file_spec)
+HostInfoLinux::ComputeSharedLibraryDirectory(FileSpec &file_spec)
 {
+    if (HostInfoPosix::ComputeSharedLibraryDirectory(file_spec))
+        return true;
     file_spec.GetDirectory() = GetProgramFileSpec().GetDirectory();
-    return static_cast<bool>(file_spec.GetDirectory());
+    return (bool)file_spec.GetDirectory();
 }
 
 bool