summaryrefslogtreecommitdiffstats
path: root/lldb/source/Host/android/HostInfoAndroid.cpp
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2018-11-01 21:18:25 +0000
committerJonas Devlieghere <jonas@devlieghere.com>2018-11-01 21:18:25 +0000
commit99f2b9949d2ca66dd0e739464eb32fc0f734fe8b (patch)
treeeca3858e63e39537d665024662b62f759c9ca219 /lldb/source/Host/android/HostInfoAndroid.cpp
parent8f3be7a32b631e9ba584872c1f0dde8fd8536c07 (diff)
downloadbcm5719-llvm-99f2b9949d2ca66dd0e739464eb32fc0f734fe8b.tar.gz
bcm5719-llvm-99f2b9949d2ca66dd0e739464eb32fc0f734fe8b.zip
[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. llvm-svn: 345891
Diffstat (limited to 'lldb/source/Host/android/HostInfoAndroid.cpp')
-rw-r--r--lldb/source/Host/android/HostInfoAndroid.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/lldb/source/Host/android/HostInfoAndroid.cpp b/lldb/source/Host/android/HostInfoAndroid.cpp
index fb23878a1dd..f2911511afb 100644
--- a/lldb/source/Host/android/HostInfoAndroid.cpp
+++ b/lldb/source/Host/android/HostInfoAndroid.cpp
@@ -29,7 +29,7 @@ void HostInfoAndroid::ComputeHostArchitectureSupport(ArchSpec &arch_32,
}
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::ResolveLibraryPath(const std::string &module_path,
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::ComputeTempFileBaseDirectory(FileSpec &file_spec) {
// 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);
}
OpenPOWER on IntegriCloud