diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-17 01:53:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-17 01:53:56 +0000 |
commit | cb7791b44231be633e38ce860b1a56de9cd704a5 (patch) | |
tree | 399beec8bc07e5c7bb82c42b52a6a943fdf227dc | |
parent | a7c9c69ad43484ae5a29268c583ce9799819002d (diff) | |
parent | 375f1a4d3288a43cb0b6441906c693301b21e78d (diff) | |
download | libhardware-cb7791b44231be633e38ce860b1a56de9cd704a5.tar.gz |
Merge "Load legacy HAL modules from the sphal namespace" into oc-dev
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | hardware.c | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -23,6 +23,7 @@ cc_library_shared { "libcutils", "liblog", "libdl", + "libvndksupport", ], cflags: ["-DQEMU_HARDWARE"], @@ -29,6 +29,8 @@ #define LOG_TAG "HAL" #include <log/log.h> +#include <vndksupport/linker.h> + /** Base path of the hal modules */ #if defined(__LP64__) #define HAL_LIBRARY_PATH1 "/system/lib64/hw" @@ -80,7 +82,7 @@ static int load(const char *id, * dlopen returns. Since RTLD_GLOBAL is not or'd in with * RTLD_NOW the external symbols will not be global */ - handle = dlopen(path, RTLD_NOW); + handle = android_load_sphal_library(path, RTLD_NOW); if (handle == NULL) { char const *err_str = dlerror(); ALOGE("load: module=%s\n%s", path, err_str?err_str:"unknown"); |