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

base/include/hidl/HidlInternal.h

diff --git a/base/include/hidl/HidlInternal.h b/base/include/hidl/HidlInternal.h
index 3cd246a..ee87b87 100644
--- a/base/include/hidl/HidlInternal.h
+++ b/base/include/hidl/HidlInternal.h
@@ -44,12 +44,8 @@
 //to avoid creating dependencies on liblog.
 void logAlwaysFatal(const char *message);
 
-// Returns VNDK-SP hw path according to "ro.vndk.version"
-#if defined(__LP64__)
-std::string getVndkSpHwPath(const char* lib = "lib64");
-#else
-std::string getVndkSpHwPath(const char* lib = "lib");
-#endif
+// Returns vndk version from "ro.vndk.version"
+std::string getVndkVersionStr();
 
 // Explicitly invokes the parameterized element's destructor;
 // intended to be used alongside the placement new operator.
@@ -118,18 +114,22 @@
 };
 
 #define HAL_LIBRARY_PATH_SYSTEM_64BIT "/system/lib64/hw/"
+#define HAL_LIBRARY_PATH_VNDK_SP_64BIT_FOR_VERSION "/apex/com.android.vndk.v%s/lib64/hw/"
 #define HAL_LIBRARY_PATH_VENDOR_64BIT "/vendor/lib64/hw/"
 #define HAL_LIBRARY_PATH_ODM_64BIT    "/odm/lib64/hw/"
 #define HAL_LIBRARY_PATH_SYSTEM_32BIT "/system/lib/hw/"
+#define HAL_LIBRARY_PATH_VNDK_SP_32BIT_FOR_VERSION "/apex/com.android.vndk.v%s/lib/hw/"
 #define HAL_LIBRARY_PATH_VENDOR_32BIT "/vendor/lib/hw/"
 #define HAL_LIBRARY_PATH_ODM_32BIT    "/odm/lib/hw/"
 
 #if defined(__LP64__)
 #define HAL_LIBRARY_PATH_SYSTEM HAL_LIBRARY_PATH_SYSTEM_64BIT
+#define HAL_LIBRARY_PATH_VNDK_SP_FOR_VERSION HAL_LIBRARY_PATH_VNDK_SP_64BIT_FOR_VERSION
 #define HAL_LIBRARY_PATH_VENDOR HAL_LIBRARY_PATH_VENDOR_64BIT
 #define HAL_LIBRARY_PATH_ODM    HAL_LIBRARY_PATH_ODM_64BIT
 #else
 #define HAL_LIBRARY_PATH_SYSTEM HAL_LIBRARY_PATH_SYSTEM_32BIT
+#define HAL_LIBRARY_PATH_VNDK_SP_FOR_VERSION HAL_LIBRARY_PATH_VNDK_SP_32BIT_FOR_VERSION
 #define HAL_LIBRARY_PATH_VENDOR HAL_LIBRARY_PATH_VENDOR_32BIT
 #define HAL_LIBRARY_PATH_ODM    HAL_LIBRARY_PATH_ODM_32BIT
 #endif