aboutsummaryrefslogtreecommitdiff
path: root/Coordinator.cpp
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-09-26 20:02:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-26 20:02:42 +0000
commitfd7b3680306b9a144c376c984b77384a3fca60d8 (patch)
tree6f61a8c2ea47d8dab80fb49924dad01b35ca4e5d /Coordinator.cpp
parentb504dd78aceb8585e63ef378b76738f241eeef74 (diff)
parent238aec52c3d9878cede2f001b442f34b16c688fb (diff)
downloadhidl-fd7b3680306b9a144c376c984b77384a3fca60d8.tar.gz
Fix getPackagePath for case with hal files in root am: 80ba1740e7 am: 3b8a67a358
am: 238aec52c3 Change-Id: I403e9c3a00bb380678c6e5a90ad0deec13145927
Diffstat (limited to 'Coordinator.cpp')
-rw-r--r--Coordinator.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Coordinator.cpp b/Coordinator.cpp
index bea5891a..5ef02154 100644
--- a/Coordinator.cpp
+++ b/Coordinator.cpp
@@ -252,8 +252,9 @@ std::string Coordinator::getPackagePath(
// Given FQName of "android.hardware.nfc.test@1.0::IFoo" and a prefix
// "android.hardware", the suffix is "nfc.test".
- const std::string suffix = StringHelper::LTrim(
- fqName.package(), packageRoot.root.package() + ".");
+ std::string suffix = StringHelper::LTrim(fqName.package(), packageRoot.root.package());
+ suffix = StringHelper::LTrim(suffix, ".");
+
std::vector<std::string> suffixComponents;
StringHelper::SplitString(suffix, '.', &suffixComponents);