diff options
Diffstat (limited to 'transport/ServiceManagement.cpp')
| -rw-r--r-- | transport/ServiceManagement.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp index d7faa6d..8f59f38 100644 --- a/transport/ServiceManagement.cpp +++ b/transport/ServiceManagement.cpp @@ -363,8 +363,7 @@ struct PassthroughServiceManager : IServiceManager1_1 { dlerror(); // clear - static std::string halLibPathVndkSp = android::base::StringPrintf( - HAL_LIBRARY_PATH_VNDK_SP_FOR_VERSION, details::getVndkVersionStr().c_str()); + static std::string halLibPathVndkSp = details::getVndkSpHwPath(); std::vector<std::string> paths = { HAL_LIBRARY_PATH_ODM, HAL_LIBRARY_PATH_VENDOR, halLibPathVndkSp, #ifndef __ANDROID_VNDK__ @@ -485,10 +484,8 @@ struct PassthroughServiceManager : IServiceManager1_1 { Return<void> debugDump(debugDump_cb _hidl_cb) override { using Arch = ::android::hidl::base::V1_0::DebugInfo::Architecture; using std::literals::string_literals::operator""s; - static std::string halLibPathVndkSp64 = android::base::StringPrintf( - HAL_LIBRARY_PATH_VNDK_SP_64BIT_FOR_VERSION, details::getVndkVersionStr().c_str()); - static std::string halLibPathVndkSp32 = android::base::StringPrintf( - HAL_LIBRARY_PATH_VNDK_SP_32BIT_FOR_VERSION, details::getVndkVersionStr().c_str()); + static std::string halLibPathVndkSp64 = details::getVndkSpHwPath("lib64"); + static std::string halLibPathVndkSp32 = details::getVndkSpHwPath("lib"); static std::vector<std::pair<Arch, std::vector<const char*>>> sAllPaths{ {Arch::IS_64BIT, { |