diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-27 15:38:17 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-01-27 15:38:17 -0800 |
| commit | 980b106908cb8e105bb8849749722c5088e2f6eb (patch) | |
| tree | 0e5e837bd3f127e7af4caffc0e2ec83444466a83 /media/libmedia/Android.mk | |
| parent | 5c2be9eddba74a503c55808816aa37cc8ce18c50 (diff) | |
| parent | 9391844deb3f6a442745cea62f78aca2cea19e50 (diff) | |
| download | frameworks_av-980b106908cb8e105bb8849749722c5088e2f6eb.zip frameworks_av-980b106908cb8e105bb8849749722c5088e2f6eb.tar.gz frameworks_av-980b106908cb8e105bb8849749722c5088e2f6eb.tar.bz2 | |
resolved conflicts for merge of 9391844d to master
Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
Diffstat (limited to 'media/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 4215b89..58dd134 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -58,10 +58,7 @@ LOCAL_SRC_FILES:= \ AudioEffect.cpp \ Visualizer.cpp \ MemoryLeakTrackUtil.cpp \ - SoundPool.cpp \ - SoundPoolThread.cpp \ - StringArray.cpp \ - AudioPolicy.cpp + StringArray.cpp LOCAL_SHARED_LIBRARIES := \ libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \ |