commit 91b5e43e2274dadeb22c393b56f01f022e5c888d
author Jooyung Han <jooyung@google.com> Fri Jul 17 01:22:17 2020 +0000
committer Jooyung Han <jooyung@google.com> Fri Jul 17 04:35:42 2020 +0000
tree e9ea9d4c80f77deba4da5d95aebc914e51fbd732
parent 544d9b595478a177dd6ae864f9ced25c003530d1

Revert "libhidlbase supports API level(29)"

This reverts commit 544d9b595478a177dd6ae864f9ced25c003530d1.

Reason for revert: b/161492170

Exempt-From-Owner-Approval: revert to fix a broken test

Change-Id: If2d17d59015ed737112dea78aaa525f053f3ca56

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index aa540c6..1c30909 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -394,7 +394,8 @@
 
         dlerror(); // clear
 
-        static std::string halLibPathVndkSp = details::getVndkSpHwPath();
+        static std::string halLibPathVndkSp = android::base::StringPrintf(
+            HAL_LIBRARY_PATH_VNDK_SP_FOR_VERSION, details::getVndkVersionStr().c_str());
         std::vector<std::string> paths = {
             HAL_LIBRARY_PATH_ODM, HAL_LIBRARY_PATH_VENDOR, halLibPathVndkSp,
 #ifndef __ANDROID_VNDK__
@@ -511,8 +512,10 @@
     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 = details::getVndkSpHwPath("lib64");
-        static std::string halLibPathVndkSp32 = details::getVndkSpHwPath("lib");
+        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::vector<std::pair<Arch, std::vector<const char*>>> sAllPaths{
             {Arch::IS_64BIT,
              {