diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-01 22:38:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-01 22:38:02 +0000 |
| commit | 5e600f4186207757d5b1a6bdec69c36af401ed02 (patch) | |
| tree | 27c88fb9fad07ae5f371fe54175f042d67cb9607 /media | |
| parent | 07a4422d8de776ec275215c0de645fda51bef89e (diff) | |
| parent | 98cc191247388132b6fd8a4ecd07abd6e4c5a0ed (diff) | |
| download | frameworks_av-5e600f4186207757d5b1a6bdec69c36af401ed02.zip frameworks_av-5e600f4186207757d5b1a6bdec69c36af401ed02.tar.gz frameworks_av-5e600f4186207757d5b1a6bdec69c36af401ed02.tar.bz2 | |
Merge "Split ManagerDefault into Manager and ManagerDefinitions"
Diffstat (limited to 'media')
| -rw-r--r-- | media/mediaserver/Android.mk | 3 |
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) \ |