diff options
author | 2024-07-11 22:07:06 +0000 | |
---|---|---|
committer | 2024-07-11 22:07:06 +0000 | |
commit | b54b9b5251377e9a5ce31390c59d56cc82556841 (patch) | |
tree | 01a01001f1839fad6bee149484ce5f1734abc68b | |
parent | 47475b41dd790108122759a0850a3ac8c40aa053 (diff) | |
parent | 736ef249c8a47331515ac19a625bf57e49787895 (diff) |
Merge "aapt2: avoid vector<const T>" into main
-rw-r--r-- | tools/aapt2/util/Files.cpp | 2 | ||||
-rw-r--r-- | tools/aapt2/util/Files.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/util/Files.cpp b/tools/aapt2/util/Files.cpp index 02e4beaed949..8ae55b8868c3 100644 --- a/tools/aapt2/util/Files.cpp +++ b/tools/aapt2/util/Files.cpp @@ -189,7 +189,7 @@ void AppendPath(std::string* base, StringPiece part) { base->append(part.data(), part.size()); } -std::string BuildPath(std::vector<const StringPiece>&& args) { +std::string BuildPath(const std::vector<StringPiece>& args) { if (args.empty()) { return ""; } diff --git a/tools/aapt2/util/Files.h b/tools/aapt2/util/Files.h index 42eeaf2d2e2a..c1a42446ec3b 100644 --- a/tools/aapt2/util/Files.h +++ b/tools/aapt2/util/Files.h @@ -60,7 +60,7 @@ FileType GetFileType(const std::string& path); void AppendPath(std::string* base, android::StringPiece part); // Concatenates the list of paths and separates each part with the directory separator. -std::string BuildPath(std::vector<const android::StringPiece>&& args); +std::string BuildPath(const std::vector<android::StringPiece>& args); // Makes all the directories in `path`. The last element in the path is interpreted as a directory. bool mkdirs(const std::string& path); |