Move device dependent modules to /vendor
Test: lunch marlin; make vendorimage;
fastboot -w flash vendor vendor.img # on marlin
Change-Id: Iee5fa24eecb8f1b929a2a40eb9c982cc087fcb4f
diff --git a/hal/Android.mk b/hal/Android.mk
index 7a006e9..98f0fba 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -156,6 +156,10 @@
LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := qcom
+
+LOCAL_PROPRIETARY_MODULE := true
+
LOCAL_CFLAGS += -Werror
include $(BUILD_SHARED_LIBRARY)
diff --git a/hal/audio_extn/ext_speaker.c b/hal/audio_extn/ext_speaker.c
index 080620d..1bf8e5b 100644
--- a/hal/audio_extn/ext_speaker.c
+++ b/hal/audio_extn/ext_speaker.c
@@ -23,9 +23,9 @@
#include <dlfcn.h>
#ifdef __LP64__
-#define LIB_SPEAKER_BUNDLE "/system/lib64/soundfx/libspeakerbundle.so"
+#define LIB_SPEAKER_BUNDLE "/vendor/lib64/soundfx/libspeakerbundle.so"
#else
-#define LIB_SPEAKER_BUNDLE "/system/lib/soundfx/libspeakerbundle.so"
+#define LIB_SPEAKER_BUNDLE "/vendor/lib/soundfx/libspeakerbundle.so"
#endif
typedef void (*set_mode_t)(int);
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index b0a6282..4cf37ee 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -29,11 +29,11 @@
// 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"
+#define VISUALIZER_LIBRARY_PATH "/vendor/lib64/soundfx/libqcomvisualizer.so"
+#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/vendor/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"
+#define VISUALIZER_LIBRARY_PATH "/vendor/lib/soundfx/libqcomvisualizer.so"
+#define OFFLOAD_EFFECTS_BUNDLE_LIBRARY_PATH "/vendor/lib/soundfx/libqcompostprocbundle.so"
#endif
#define ADM_LIBRARY_PATH "libadm.so"