commit cb7791b44231be633e38ce860b1a56de9cd704a5
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 17 01:53:55 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 17 01:53:56 2017 +0000
tree 399beec8bc07e5c7bb82c42b52a6a943fdf227dc
parent a7c9c69ad43484ae5a29268c583ce9799819002d
parent 375f1a4d3288a43cb0b6441906c693301b21e78d

Merge "Load legacy HAL modules from the sphal namespace" into oc-dev

Android.bp

diff --git a/Android.bp b/Android.bp
index f6aacd2..9c5a9cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,6 +23,7 @@
         "libcutils",
         "liblog",
         "libdl",
+        "libvndksupport",
     ],
     cflags: ["-DQEMU_HARDWARE"],
 

hardware.c

diff --git a/hardware.c b/hardware.c
index 7e4debe..37b61c4 100644
--- a/hardware.c
+++ b/hardware.c
@@ -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 @@
      * 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");