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