Remove std::string/std::vector use from os-specific layer

This commit is contained in:
baldurk
2019-12-16 17:06:15 +00:00
parent 25536836b6
commit 5f72b9d53c
70 changed files with 916 additions and 883 deletions
+4 -3
View File
@@ -79,7 +79,8 @@ std::string getToolInSDK(ToolDir subdir, const std::string &jdkroot, const std::
// otherwise we need to find the build-tools versioned folder
toolpath = sdkroot + "/build-tools/";
std::vector<PathEntry> paths = FileIO::GetFilesInDirectory(toolpath.c_str());
rdcarray<PathEntry> paths;
FileIO::GetFilesInDirectory(toolpath.c_str(), paths);
if(paths.empty())
break;
@@ -275,9 +276,9 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
// finally try to locate it in our own distributed android subfolder
{
std::string libpath;
rdcstr libpath;
FileIO::GetLibraryFilename(libpath);
std::string libdir = get_dirname(FileIO::GetFullPathname(libpath));
rdcstr libdir = get_dirname(FileIO::GetFullPathname(libpath));
toolpath = libdir + "/plugins/android/" + toolname;
if(toolExists(toolpath))