commit 2236bd143d4cddc8d485a5a007530ccee4628c11
author Zhuoyao Zhang <zhuoyao@google.com> Thu Feb 09 15:45:22 2017 -0800
committer Zhuoyao Zhang <zhuoyao@google.com> Thu Feb 09 15:45:22 2017 -0800
tree 3975b8a37c8bdbe28bc0ad6f3f9a8e7e8abc4f05
parent 882425902ffb41970134736df4a5373bd8852258

Load profiling functions with package and version info.

Test: vts -m VibratorHidlTargetProfilingTest
Change-Id: Icf8c703170ee3b5595fba9629a44a01fd88fb322

base/HidlSupport.cpp

diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 094e0b1..912a5b0 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -397,8 +397,10 @@
                     const char *,
                     const char *,
                     std::vector<void *> *);
-            auto cb = (cb_fun)dlsym(handle,
-                    ("HIDL_INSTRUMENTATION_FUNCTION_" + mInterfaceName).c_str());
+            FQName package_name = FQName(mInstrumentationLibPackage);
+            auto cb = (cb_fun)dlsym(handle, ("HIDL_INSTRUMENTATION_FUNCTION_"
+                        + package_name.tokenName() + "_"
+                        + mInterfaceName).c_str());
             if ((error = dlerror()) != NULL) {
                 LOG(WARNING)
                     << "couldn't find symbol: HIDL_INSTRUMENTATION_FUNCTION_"