summaryrefslogtreecommitdiffstats
path: root/media/mediaserver
diff options
context:
space:
mode:
authorFrançois Gaffie <francois.gaffie@intel.com>2015-03-18 17:52:40 +0100
committerJean-Michel Trivi <jmtrivi@google.com>2015-04-01 10:19:16 -0700
commit98cc191247388132b6fd8a4ecd07abd6e4c5a0ed (patch)
treeb447149a320aabc6fb28f2522e6a55db835ce537 /media/mediaserver
parentad3183e2d4cecd02f6261270a7ea1c68be0efa0f (diff)
downloadframeworks_av-98cc191247388132b6fd8a4ecd07abd6e4c5a0ed.zip
frameworks_av-98cc191247388132b6fd8a4ecd07abd6e4c5a0ed.tar.gz
frameworks_av-98cc191247388132b6fd8a4ecd07abd6e4c5a0ed.tar.bz2
Split ManagerDefault into Manager and ManagerDefinitions
This patch splits the managerdefault into a manager and a manager defintion library that contains all pillar elements of a policy manager. It renames the file with the name of the main class they contains. It splits the AudioPort into AudioPort and AudioPatch. Change-Id: I992cf0b8aed895805cc003ba0980d2c9e92c985b Signed-off-by: François Gaffie <francois.gaffie@intel.com>
Diffstat (limited to 'media/mediaserver')
-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 baf65f6..0f36a90 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -31,13 +31,14 @@ LOCAL_SHARED_LIBRARIES := \
libradioservice
LOCAL_STATIC_LIBRARIES := \
- libregistermsext
+ libregistermsext
LOCAL_C_INCLUDES := \
frameworks/av/media/libmediaplayerservice \
frameworks/av/services/medialog \
frameworks/av/services/audioflinger \
frameworks/av/services/audiopolicy \
+ frameworks/av/services/audiopolicy/common/managerdefinitions/include \
frameworks/av/services/camera/libcameraservice \
frameworks/av/services/mediaresourcemanager \
$(call include-path-for, audio-utils) \