Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into lmp-dev am: 1f0f83e1ff am: b3ad2a046e am: dfd990face am: 9f623d6475 am: d4517e643b am: f4c3975abf am: 878d778986 am: a31de317d4 am: 025df90241 am: 853a6bc15f am: d9a108d531
am: 3f7ffd5d56
Change-Id: I6a98056f0c2d56c34bc7780e05f055ae6e9e731e
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
