commit 6b1f0cd4b13134220824d52339269c54e51e79b6
author Zhuoyao Zhang <zhuoyao@google.com> Wed Nov 02 18:36:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 02 18:36:10 2016 +0000
tree 59d94b0a6b54959319b60f19b2c3509b2d4a28e5
parent 31f2db84208d9d9827c2df2dd59a90d6517742eb
parent 8bed09ff7b71bc9aee6c0b17582ef0e2632d6bde

Merge "Support customize the path to lookup for hidl instrumenation libraries."

HidlSupport.cpp

diff --git a/HidlSupport.cpp b/HidlSupport.cpp
index 666c606..769db74 100644
--- a/HidlSupport.cpp
+++ b/HidlSupport.cpp
@@ -184,9 +184,17 @@
         std::vector<InstrumentationCallback> *instrumentationCallbacks) {
 #ifdef LIBHIDL_TARGET_DEBUGGABLE
     std::vector<std::string> instrumentationLibPaths;
-    instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_SYSTEM);
-    instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_VENDOR);
-    instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_ODM);
+    char instrumentation_lib_path[PROPERTY_VALUE_MAX];
+    if (property_get("hal.instrumentation.lib.path",
+                     instrumentation_lib_path,
+                     "") > 0) {
+        instrumentationLibPaths.push_back(instrumentation_lib_path);
+    } else {
+        instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_SYSTEM);
+        instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_VENDOR);
+        instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_ODM);
+    }
+
     for (auto path : instrumentationLibPaths) {
         DIR *dir = opendir(path.c_str());
         if (dir == 0) {