[Lldb-commits] [lldb] r345891 - [FileSystem] Change FileSpec constructor signature.

[Jonas Devlieghere via lldb-commits]

Author: jdevlieghere
Date: Thu Nov  1 14:18:25 2018
New Revision: 345891

URL: http://llvm.org/viewvc/llvm-project?rev=345891&view=rev
Log:
[FileSystem] Change FileSpec constructor signature.

Fix breakage due to the recent FileSpec change that extracts the path
resultion logic into FileSystem for the Android host.

Modified:
    lldb/trunk/source/Host/android/HostInfoAndroid.cpp

Modified: lldb/trunk/source/Host/android/HostInfoAndroid.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/android/HostInfoAndroid.cpp?rev=345891&r1=345890&r2=345891&view=diff
==============================================================================
--- lldb/trunk/source/Host/android/HostInfoAndroid.cpp (original)
+++ lldb/trunk/source/Host/android/HostInfoAndroid.cpp Thu Nov  1 14:18:25 2018
@@ -29,7 +29,7 @@ void HostInfoAndroid::ComputeHostArchite
 }
 
 FileSpec HostInfoAndroid::GetDefaultShell() {
-  return FileSpec("/system/bin/sh", false);
+  return FileSpec("/system/bin/sh");
 }
 
 FileSpec HostInfoAndroid::ResolveLibraryPath(const std::string &module_path,
@@ -66,7 +66,8 @@ FileSpec HostInfoAndroid::ResolveLibrary
     ld_paths.push_back(StringRef(*it));
 
   for (const StringRef &path : ld_paths) {
-    FileSpec file_candidate(path.str().c_str(), true);
+    FileSpec file_candidate(path.str().c_str());
+    FileSystem::Instance().Resolve(file_candidate);
     file_candidate.AppendPathComponent(module_path.c_str());
 
     if (FileSystem::Instance().Exists(file_candidate))
@@ -85,7 +86,7 @@ bool HostInfoAndroid::ComputeTempFileBas
   // invalid directory, we substitute the path with /data/local/tmp, which is
   // correct at least in some cases (i.e., when running as shell user).
   if (!success || !FileSystem::Instance().Exists(file_spec))
-    file_spec = FileSpec("/data/local/tmp", false);
+    file_spec = FileSpec("/data/local/tmp");
 
   return FileSystem::Instance().Exists(file_spec);
 }


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits