summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorJustin Yun <justinyun@google.com>2018-10-18 18:41:56 +0900
committerJustin Yun <justinyun@google.com>2018-10-18 18:49:27 +0900
commit6a323eda0fdde5aba5495f75773f17664fd41b82 (patch)
treeb24895727578c9a617d6239a44caf53f1b3886b4 /base
parent176eaf71a3b8f51cd3b164d44b0404e0c47b23d6 (diff)
downloadlibhidl-6a323eda0fdde5aba5495f75773f17664fd41b82.tar.gz
Do not add system to HAL library path for vendor process.
Vendor process is not allowed to use system libs. Do not search 'system/lib[64]/hw' for vendor hal services. Bug: 117166926 Test: Boot and check camera/wifi/bluetooth Change-Id: I3894a6ecb359c5e2e17bd8171dad4731ac6071bd
Diffstat (limited to 'base')
-rw-r--r--base/HidlInternal.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/base/HidlInternal.cpp b/base/HidlInternal.cpp
index 7d7e960..81b353d 100644
--- a/base/HidlInternal.cpp
+++ b/base/HidlInternal.cpp
@@ -145,7 +145,9 @@ void HidlInstrumentor::registerInstrumentationCallbacks(
} else {
static std::string halLibPathVndkSp = android::base::StringPrintf(
HAL_LIBRARY_PATH_VNDK_SP_FOR_VERSION, getVndkVersionStr().c_str());
+#ifndef __ANDROID_VNDK__
instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_SYSTEM);
+#endif
instrumentationLibPaths.push_back(halLibPathVndkSp);
instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_VENDOR);
instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_ODM);