commit 219106c3719284c8621825a12add22c02e7cd2db
author Jooyung Han <jooyung@google.com> Fri Jul 17 15:01:19 2020 +0900
committer Jooyung Han <jooyung@google.com> Fri Jul 17 06:07:49 2020 +0000
tree 76ede647f67d07bd04a694ca7738336a67e15a41
parent 81784bd75d1ee9e035f622531dd513dee84f70f9

Revert "Revert "libhidlbase supports API level(29)""

This reverts commit 91b5e43e2274dadeb22c393b56f01f022e5c888d.

-- copied from original --

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.

Exempt-From-Owner-Approval: re-landing in the internal branch

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: I131d903c43aaaf1ba934933ac89aba5e09a34269

transport/ServiceManagement.cpp

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 @@
 
         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 @@
     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,
              {