diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-23 14:06:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-23 14:06:00 -0700 |
| commit | ef36d496477d1e2ae99c3cd43eee5cf7e82b0883 (patch) | |
| tree | 17179b49680f4c242c80ecd1dc9887fcab6ecbdb /media | |
| parent | fdac94af1d925a983f63aa50d50f1e1559844928 (diff) | |
| parent | 78b5e82f421bfdf5c1c72bd0ca2fb7f3bc1a45ff (diff) | |
| download | frameworks_av-ef36d496477d1e2ae99c3cd43eee5cf7e82b0883.zip frameworks_av-ef36d496477d1e2ae99c3cd43eee5cf7e82b0883.tar.gz frameworks_av-ef36d496477d1e2ae99c3cd43eee5cf7e82b0883.tar.bz2 | |
Merge "Revert "Split libmedia into libmedia and libmedia_native""
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/Android.mk | 49 | ||||
| -rw-r--r-- | media/libmedia_native/Android.mk | 32 |
2 files changed, 37 insertions, 44 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 \ diff --git a/media/libmedia_native/Android.mk b/media/libmedia_native/Android.mk index 07f0978..065a90f 100644 --- a/media/libmedia_native/Android.mk +++ b/media/libmedia_native/Android.mk @@ -1,39 +1,11 @@ -# FIXME remove "/../libmedia" at same time as rename -LOCAL_PATH := $(call my-dir)/../libmedia +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ - AudioParameter.cpp -LOCAL_MODULE:= libmedia_helper -LOCAL_MODULE_TAGS := optional - -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - AudioEffect.cpp \ - AudioRecord.cpp \ - AudioSystem.cpp \ - AudioTrack.cpp \ - IAudioFlingerClient.cpp \ - IAudioFlinger.cpp \ - IAudioPolicyService.cpp \ - IAudioRecord.cpp \ - IAudioTrack.cpp \ - IEffectClient.cpp \ - IEffect.cpp \ - ToneGenerator.cpp - -LOCAL_SHARED_LIBRARIES := \ - libaudioutils libbinder libcutils libutils +LOCAL_SRC_FILES := LOCAL_MODULE:= libmedia_native -LOCAL_C_INCLUDES := \ - $(call include-path-for, audio-utils) - LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) |