| commit | e6d7e63b8e81a533c1f1ab94e35676aecddd133e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 30 22:07:10 2023 +0000 |
| committer | Copybara-Service <copybara-worker@google.com> | Tue Mar 05 20:36:27 2024 -0800 |
| tree | 08d56688398b4ecfcb49e1a43682ce41b1206f19 | |
| parent | 74bcfa619317f1a15760217b496fde437dbfa6c6 [diff] |
Merge "pathutils: add canonicalPath method" am: cf821ae0db am: be8106fadb am: eb68d22add am: b161b3e749 am: 6977d01aea Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2511655 Change-Id: I196dc4aa68c1d75a64ac901ee5912681d350a690 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> GitOrigin-RevId: e421c374638dd455903e9021558bd349fd38a2b4
diff --git a/base/include/aemu/base/files/PathUtils.h b/base/include/aemu/base/files/PathUtils.h index 93473dd..939b592 100644 --- a/base/include/aemu/base/files/PathUtils.h +++ b/base/include/aemu/base/files/PathUtils.h
@@ -301,6 +301,8 @@ return PathUtils::recompose(components, HOST_TYPE); } + static std::string canonicalPath(std::string path); + // Given a list of components returned by decompose(), simplify it // by removing instances of '.' and '..' when that makes sense. // Note that it is not possible to simplify initial instances of