diff options
| author | Jooyung Han <jooyung@google.com> | 2020-07-16 19:49:39 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2020-07-16 19:58:21 +0900 |
| commit | 544d9b595478a177dd6ae864f9ced25c003530d1 (patch) | |
| tree | b79fb1ad7ac97a93e96960a706b15b501b1e3031 /transport | |
| parent | 332d156afae77a67f4c8dc8b076a840f749b48de (diff) | |
| download | libhidl-544d9b595478a177dd6ae864f9ced25c003530d1.tar.gz | |
libhidlbase supports API level(29)
libhidlbase searches impl libs of passthrough HALs from various paths
including VNDK-sp /hw. VNDK-sp path differs in R and Q.
Bug: 158564319
Test: install R-built media apex on Q device
atest android.media.cts.MediaDrmClearkeyTest
=> see logcat if there's an error to load libmpeg2extractor
Change-Id: I2c9be242d9c81d92ccda81f5d09abcb5ccdcf87b
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, { |