commit 7ddf867a1a20700aa3242c5d1ab3c621a69ef3e7
author Andy Hung <hunga@google.com> Thu Mar 31 10:30:42 2016 -0700
committer Andy Hung <hunga@google.com> Thu Mar 31 10:30:42 2016 -0700
tree 6265f18baedb231bcd5aa93feecf6a0edccba3a4
parent f9583c366559860ec5f287816908216c50cb917e

Fix dlopen library load

dlopen does not go through default library path search
if there is a '/' in the library name.

Bug: 27905931
Change-Id: Id9dbfe6938499ef783222c6851a65d1f7dd611cf

hal/audio_extn/ext_speaker.c

diff --git a/hal/audio_extn/ext_speaker.c b/hal/audio_extn/ext_speaker.c
index cb8cfc1..080620d 100644
--- a/hal/audio_extn/ext_speaker.c
+++ b/hal/audio_extn/ext_speaker.c
@@ -22,7 +22,11 @@
 #include <audio_hw.h>
 #include <dlfcn.h>
 
-#define LIB_SPEAKER_BUNDLE "soundfx/libspeakerbundle.so"
+#ifdef __LP64__
+#define LIB_SPEAKER_BUNDLE "/system/lib64/soundfx/libspeakerbundle.so"
+#else
+#define LIB_SPEAKER_BUNDLE "/system/lib/soundfx/libspeakerbundle.so"
+#endif
 
 typedef void (*set_mode_t)(int);
 typedef void (*set_speaker_on_t)(bool);

hal/audio_extn/soundtrigger.c

diff --git a/hal/audio_extn/soundtrigger.c b/hal/audio_extn/soundtrigger.c
index 9909d50..32b7b85 100644
--- a/hal/audio_extn/soundtrigger.c
+++ b/hal/audio_extn/soundtrigger.c
@@ -31,7 +31,11 @@
 #define XSTR(x) STR(x)
 #define STR(x) #x
 
-#define SOUND_TRIGGER_LIBRARY_PATH "hw/sound_trigger.primary.%s.so"
+#ifdef __LP64__
+#define SOUND_TRIGGER_LIBRARY_PATH "/system/vendor/lib64/hw/sound_trigger.primary.%s.so"
+#else
+#define SOUND_TRIGGER_LIBRARY_PATH "/system/vendor/lib/hw/sound_trigger.primary.%s.so"
+#endif
 
 struct sound_trigger_info  {
     struct sound_trigger_session_info st_ses;

hal/audio_hw.h

diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 9a956f9..1a1e0ef 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -27,8 +27,14 @@
 #include <audio_route/audio_route.h>
 #include "voice.h"
 
-#define VISUALIZER_LIBRARY_PATH "soundfx/libqcomvisualizer.so"
-#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "soundfx/libqcompostprocbundle.so"
+// dlopen() does not go through default library path search if there is a "/" in the library name.
+#ifdef __LP64__
+#define VISUALIZER_LIBRARY_PATH "/system/lib64/soundfx/libqcomvisualizer.so"
+#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/system/lib64/soundfx/libqcompostprocbundle.so"
+#else
+#define VISUALIZER_LIBRARY_PATH "/system/lib/soundfx/libqcomvisualizer.so"
+#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/system/lib/soundfx/libqcompostprocbundle.so"
+#endif
 #define ADM_LIBRARY_PATH "libadm.so"
 
 /* Flags used to initialize acdb_settings variable that goes to ACDB library */