diff options
| author | Steven Moreland <smoreland@google.com> | 2017-09-29 19:03:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 19:03:46 +0000 |
| commit | 6e1376d7f6f7fd9b10c7f2182da9f2174371ce18 (patch) | |
| tree | 63036bac6b79b11642483bd7962fdf516fb57142 /Coordinator.cpp | |
| parent | e1b261a6de3c5c8d238e73062d9926971ff37714 (diff) | |
| parent | c3f3cff444fd7f85413b5d9b35fda06fedde3806 (diff) | |
| download | hidl-6e1376d7f6f7fd9b10c7f2182da9f2174371ce18.tar.gz | |
Fix problem with multiple '/' in package paths. am: 1a85fd96f8 am: d6a79b4053
am: c3f3cff444
Change-Id: I3b7e8be03b0b86f8049c8628fb890418313108e4
Diffstat (limited to 'Coordinator.cpp')
| -rw-r--r-- | Coordinator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Coordinator.cpp b/Coordinator.cpp index 838b7272..10b88674 100644 --- a/Coordinator.cpp +++ b/Coordinator.cpp @@ -73,7 +73,7 @@ status_t Coordinator::addPackagePath(const std::string& root, const std::string& } } - mPackageRoots.push_back({StringHelper::RTrimAll(path, "/"), package}); + mPackageRoots.push_back({path, package}); return OK; } void Coordinator::addDefaultPackagePath(const std::string& root, const std::string& path) { @@ -321,7 +321,7 @@ std::string Coordinator::getPackagePath( std::vector<std::string> components; if (!relative) { - components.push_back(packageRoot.path); + components.push_back(StringHelper::RTrimAll(packageRoot.path, "/")); } components.insert(components.end(), suffixComponents.begin(), suffixComponents.end()); components.push_back(sanitized ? fqName.sanitizedVersion() : fqName.version()); |