summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-04-01 22:39:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-01 22:39:52 +0000
commitda2246b54e3eed9e9366c98688b19f997d869e79 (patch)
treed771c73b97063bda218171afab8cb2303e1999f5 /media
parent91b7a7b5343c5b6fccd9356449dfd393d0d66f35 (diff)
parent2110e04cdfbf9ad85ce154ce5f778ee5ccfc95eb (diff)
downloadframeworks_av-da2246b54e3eed9e9366c98688b19f997d869e79.zip
frameworks_av-da2246b54e3eed9e9366c98688b19f997d869e79.tar.gz
frameworks_av-da2246b54e3eed9e9366c98688b19f997d869e79.tar.bz2
Merge "Split ManagerDefault into manager and engine"
Diffstat (limited to 'media')
-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 0f36a90..0e2e48c 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -39,6 +39,8 @@ LOCAL_C_INCLUDES := \
frameworks/av/services/audioflinger \
frameworks/av/services/audiopolicy \
frameworks/av/services/audiopolicy/common/managerdefinitions/include \
+ frameworks/av/services/audiopolicy/common/include \
+ frameworks/av/services/audiopolicy/engine/interface \
frameworks/av/services/camera/libcameraservice \
frameworks/av/services/mediaresourcemanager \
$(call include-path-for, audio-utils) \