diff options
| author | Jooyung Han <jooyung@google.com> | 2020-07-16 22:57:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 22:57:52 +0000 |
| commit | eb1b2d1cedb39ab98d48231b13cba09fd7eb705b (patch) | |
| tree | 76ede647f67d07bd04a694ca7738336a67e15a41 /transport | |
| parent | 3234838d2f52e698db45784c28ff958c075d63e2 (diff) | |
| parent | 4cd9eed4b017dd10cae20c7fc87f3fda68510c22 (diff) | |
| download | libhidl-eb1b2d1cedb39ab98d48231b13cba09fd7eb705b.tar.gz | |
libhidlbase supports API level(29) am: 544d9b5954 am: 4cd9eed4b0
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1364657
Change-Id: I4b1ca0be979497dbac9ab63c732169fa915d4322
Diffstat (limited to 'transport')
| -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 1c30909..aa540c6 100644 --- a/transport/ServiceManagement.cpp +++ b/transport/ServiceManagement.cpp @@ -394,8 +394,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__ @@ -512,10 +511,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, { |