diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-23 14:05:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-23 14:05:52 -0700 |
| commit | 78b5e82f421bfdf5c1c72bd0ca2fb7f3bc1a45ff (patch) | |
| tree | b3446119a9b6c03dcca98d1d9ee31a83adb8acad /media/libmedia/Android.mk | |
| parent | c524ffda17017d8467a237a1eddfd7e7c03c6617 (diff) | |
| download | frameworks_av-78b5e82f421bfdf5c1c72bd0ca2fb7f3bc1a45ff.zip frameworks_av-78b5e82f421bfdf5c1c72bd0ca2fb7f3bc1a45ff.tar.gz frameworks_av-78b5e82f421bfdf5c1c72bd0ca2fb7f3bc1a45ff.tar.bz2 | |
Revert "Split libmedia into libmedia and libmedia_native"
This reverts commit 0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb
Diffstat (limited to 'media/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 43008d4..21e8f29 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -3,26 +3,47 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - autodetect.cpp \ - IMediaDeathNotifier.cpp \ - IMediaMetadataRetriever.cpp \ - IMediaPlayerClient.cpp \ - IMediaPlayer.cpp \ + AudioParameter.cpp +LOCAL_MODULE:= libmedia_helper +LOCAL_MODULE_TAGS := optional + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + AudioTrack.cpp \ + IAudioFlinger.cpp \ + IAudioFlingerClient.cpp \ + IAudioTrack.cpp \ + IAudioRecord.cpp \ + AudioRecord.cpp \ + AudioSystem.cpp \ + mediaplayer.cpp \ IMediaPlayerService.cpp \ + IMediaPlayerClient.cpp \ IMediaRecorderClient.cpp \ + IMediaPlayer.cpp \ IMediaRecorder.cpp \ - IOMX.cpp \ IStreamSource.cpp \ - JetPlayer.cpp \ - mediametadataretriever.cpp \ - mediaplayer.cpp \ - MediaProfiles.cpp \ + Metadata.cpp \ mediarecorder.cpp \ - MediaScannerClient.cpp \ + IMediaMetadataRetriever.cpp \ + mediametadataretriever.cpp \ + ToneGenerator.cpp \ + JetPlayer.cpp \ + IOMX.cpp \ + IAudioPolicyService.cpp \ MediaScanner.cpp \ - MemoryLeakTrackUtil.cpp \ - Metadata.cpp \ - Visualizer.cpp + MediaScannerClient.cpp \ + autodetect.cpp \ + IMediaDeathNotifier.cpp \ + MediaProfiles.cpp \ + IEffect.cpp \ + IEffectClient.cpp \ + AudioEffect.cpp \ + Visualizer.cpp \ + MemoryLeakTrackUtil.cpp LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox libicuuc libexpat \ |