tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Search for subhal .so files in additional directories" into rvc-dev am: 358db3b106

Browse source 
Change-Id: I9394c88b9c8fed821dc8640af75567f0ef20825a
This commit is contained in:
TreeHugger Robot 2020-05-02 02:48:30 +00:00 committed by Automerger Merge Worker
commit 08da8ed673
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sensors/common/default/2.X/multihal/HalProxy.cpp
View file

@ -426,7 +426,7 @@ void HalProxy::initializeSubHalListFromConfigFile(const char* configFileName) {
} else {
std::string subHalLibraryFile;
while (subHalConfigStream >> subHalLibraryFile) {
void* handle = dlopen(subHalLibraryFile.c_str(), RTLD_NOW);
void* handle = getHandleForSubHalSharedObject(subHalLibraryFile);
if (handle == nullptr) {
ALOGE("dlopen failed for library: %s", subHalLibraryFile.c_str());
} else {
@ -491,6 +491,25 @@ void HalProxy::initializeSensorList() {
}
}
void* HalProxy::getHandleForSubHalSharedObject(const std::string& filename) {
static const std::string kSubHalShareObjectLocations[] = {
"", // Default locations will be searched
#ifdef __LP64__
"/vendor/lib64/hw/", "/odm/lib64/hw/"
#else
"/vendor/lib/hw/", "/odm/lib/hw/"
#endif
};
for (const std::string& dir : kSubHalShareObjectLocations) {
void* handle = dlopen((dir + filename).c_str(), RTLD_NOW);
if (handle != nullptr) {
return handle;
}
}
return nullptr;
}
void HalProxy::init() {
initializeSensorList();
}

10
sensors/common/default/2.X/multihal/include/HalProxy.h
View file

@ -266,6 +266,16 @@ class HalProxy : public V2_0::implementation::IScopedWakelockRefCounter,
*/
void initializeSensorList();
/**
* Try using the default include directories as well as the directories defined in
* kSubHalShareObjectLocations to get a handle for dlsym for a subhal.
*
* @param filename The file name to search for.
*
* @return The handle or nullptr if search failed.
*/
void* getHandleForSubHalSharedObject(const std::string& filename);
/**
* Calls the helper methods that all ctors use.
*/