commit 6a323eda0fdde5aba5495f75773f17664fd41b82
author Justin Yun <justinyun@google.com> Thu Oct 18 18:41:56 2018 +0900
committer Justin Yun <justinyun@google.com> Thu Oct 18 18:49:27 2018 +0900
tree b24895727578c9a617d6239a44caf53f1b3886b4
parent 176eaf71a3b8f51cd3b164d44b0404e0c47b23d6

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

base/HidlInternal.cpp

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 @@
     } 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);