Merge "Use libaudio instead of libmedia" am: 9581957a57 am: 1cb6cefdb3 am: ed75323e27
am: 2e09c0ba8a
Change-Id: Ib4d969c42e1ee7d3992a3a725b27d826c4b0d31e
diff --git a/src/jni/rtp/Android.mk b/src/jni/rtp/Android.mk
index ad70c88..b564f1b 100644
--- a/src/jni/rtp/Android.mk
+++ b/src/jni/rtp/Android.mk
@@ -50,8 +50,7 @@
frameworks/av/media/libstagefright/codecs/amrnb/enc/include \
frameworks/av/media/libstagefright/codecs/amrnb/enc/src \
frameworks/av/media/libstagefright/codecs/amrnb/dec/include \
- frameworks/av/media/libstagefright/codecs/amrnb/dec/src \
- $(call include-path-for, audio-effects)
+ frameworks/av/media/libstagefright/codecs/amrnb/dec/src
# getInput() is deprecated but we want to continue to track the usage of it elsewhere
LOCAL_CFLAGS += -fvisibility=hidden -Wall -Wextra -Wno-deprecated-declarations -Werror
diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp
index da02861..bad584b 100644
--- a/src/jni/rtp/AudioGroup.cpp
+++ b/src/jni/rtp/AudioGroup.cpp
@@ -42,7 +42,7 @@
#include <media/AudioTrack.h>
#include <media/mediarecorder.h>
#include <media/AudioEffect.h>
-#include <audio_effects/effect_aec.h>
+#include <system/audio_effects/effect_aec.h>
#include <system/audio.h>
#include <ScopedUtfChars.h>