diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-10 01:32:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-10 01:32:43 +0000 |
| commit | 2dda40d638138c426cf4a66ddd0da8794c87f5c7 (patch) | |
| tree | fde01dcd3d550a8b1b34d2a264ab8bd912064852 /media/libmedia/Android.mk | |
| parent | 9cea7aa494f6f93a473cab936af79868fc8efea6 (diff) | |
| parent | 275e8e9de2e11b4b344f5a201f1f0e51fda02d9c (diff) | |
| download | frameworks_av-2dda40d638138c426cf4a66ddd0da8794c87f5c7.zip frameworks_av-2dda40d638138c426cf4a66ddd0da8794c87f5c7.tar.gz frameworks_av-2dda40d638138c426cf4a66ddd0da8794c87f5c7.tar.bz2 | |
Merge "audio policy: add support for custom mixes" into lmp-mr1-dev
Diffstat (limited to 'media/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index e012116..a2e0909 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -59,7 +59,8 @@ LOCAL_SRC_FILES:= \ MemoryLeakTrackUtil.cpp \ SoundPool.cpp \ SoundPoolThread.cpp \ - StringArray.cpp + StringArray.cpp \ + AudioPolicy.cpp LOCAL_SRC_FILES += ../libnbaio/roundup.c |