summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-03-18 00:14:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-18 00:14:12 +0000
commit314869117d5e3365fc3e43fee01209d18515ca42 (patch)
treea1975d895276c929a5e5a20166124368f2e21eb9 /media/mediaserver
parent37e05edf1cfe297f9c7d382787ecab53d5a2b5c8 (diff)
parentc7e5040aa8b8e4da86814bf560346c7571e48087 (diff)
downloadframeworks_av-314869117d5e3365fc3e43fee01209d18515ca42.zip
frameworks_av-314869117d5e3365fc3e43fee01209d18515ca42.tar.gz
frameworks_av-314869117d5e3365fc3e43fee01209d18515ca42.tar.bz2
Merge "move audio policy service to a separate library"
Diffstat (limited to 'media/mediaserver')
-rw-r--r--media/mediaserver/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 09a9ef8..d3e546a 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libaudioflinger \
+ libaudiopolicy \
libcamera_metadata\
libcameraservice \
libmedialogservice \
@@ -33,6 +34,7 @@ LOCAL_C_INCLUDES := \
frameworks/av/media/libmediaplayerservice \
frameworks/av/services/medialog \
frameworks/av/services/audioflinger \
+ frameworks/av/services/audiopolicy \
frameworks/av/services/camera/libcameraservice
LOCAL_MODULE:= mediaserver