diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-10 01:38:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 01:38:52 +0000 |
| commit | c49d9cda49dab8b7dd0376cf56476b3e1895d5c6 (patch) | |
| tree | fde01dcd3d550a8b1b34d2a264ab8bd912064852 /media/libmedia/Android.mk | |
| parent | 61697a5c1ddd2ad882a889474822851187734cf4 (diff) | |
| parent | 2dda40d638138c426cf4a66ddd0da8794c87f5c7 (diff) | |
| download | frameworks_av-c49d9cda49dab8b7dd0376cf56476b3e1895d5c6.zip frameworks_av-c49d9cda49dab8b7dd0376cf56476b3e1895d5c6.tar.gz frameworks_av-c49d9cda49dab8b7dd0376cf56476b3e1895d5c6.tar.bz2 | |
am 2dda40d6: Merge "audio policy: add support for custom mixes" into lmp-mr1-dev
* commit '2dda40d638138c426cf4a66ddd0da8794c87f5c7':
audio policy: add support for custom mixes
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 |