maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Jonas Devlieghere 2018-11-01 21:18:25 +00:00
parent 8f3be7a32b
commit 99f2b9949d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/source/Host/android/HostInfoAndroid.cpp
View File

@ -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);
}