summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRicardo Garcia <rago@google.com>2015-04-14 00:23:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-14 00:24:01 +0000
commitcf31941ef4cf1a882cc23743ada41e49f8e1be03 (patch)
treeefeb057430dea9922e6421e65a76a963c76a57c4 /media
parentaf52793677e26d76788fc63d2df08d0c141013bc (diff)
parentf097cae65bfce7200938c5bd89e7e9b61cba78b3 (diff)
downloadframeworks_av-cf31941ef4cf1a882cc23743ada41e49f8e1be03.zip
frameworks_av-cf31941ef4cf1a882cc23743ada41e49f8e1be03.tar.gz
frameworks_av-cf31941ef4cf1a882cc23743ada41e49f8e1be03.tar.bz2
Merge "TimestretchBufferProvider integration with Sonic Library"
Diffstat (limited to 'media')
-rw-r--r--media/mediaserver/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 0e2e48c..ba47172 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -45,7 +45,8 @@ LOCAL_C_INCLUDES := \
frameworks/av/services/mediaresourcemanager \
$(call include-path-for, audio-utils) \
frameworks/av/services/soundtrigger \
- frameworks/av/services/radio
+ frameworks/av/services/radio \
+ external/sonic
LOCAL_MODULE:= mediaserver
LOCAL_32_BIT_ONLY := true