aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-03-30 19:15:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-30 19:15:00 +0000
commitb161b3e74963cda10891d83ca5fedc7e4b7c9c75 (patch)
tree347074a13828e49adf1096900a10647d60f1142c
parent513f6d4c02385d66c86bea0bcf3389e6beea2149 (diff)
parenteb68d22add22d7eba1ce37242b6910f06fdacbaf (diff)
downloadaemu-b161b3e74963cda10891d83ca5fedc7e4b7c9c75.tar.gz
Merge "pathutils: add canonicalPath method" am: cf821ae0db am: be8106fadb am: eb68d22add
Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2511655 Change-Id: Id85c8aed3a6977f41d5a0e015512a1db652ab63c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--base/include/aemu/base/files/PathUtils.h2
1 files changed, 2 insertions, 0 deletions
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 @@ public:
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