hal: msm8974: select HFP devices based on hfp active session am: d789e43c8a
am: 57f88c6be4

Change-Id: Id0ff00a9489bc14fbbb3d11eeeddc8a9f0ca589f
diff --git a/legacy/libalsa-intf/alsa_pcm.c b/legacy/libalsa-intf/alsa_pcm.c
index a814ae8..84d6549 100644
--- a/legacy/libalsa-intf/alsa_pcm.c
+++ b/legacy/libalsa-intf/alsa_pcm.c
@@ -46,10 +46,6 @@
 
 #include "alsa_audio.h"
 
-#define __force
-#define __bitwise
-#define __user
-
 #define DEBUG 1
 
 enum format_alias {
diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
index 9b86eaf..73619c6 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -14,6 +14,7 @@
     $(call include-path-for, audio-effects)
 
 LOCAL_SHARED_LIBRARIES := \
+    liblog \
     libcutils
 
 LOCAL_SHARED_LIBRARIES += libdl