diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-22 07:14:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-22 07:14:27 -0700 |
| commit | 898b11f2aeaaa2bed84d963a3fcfd3b229e00b99 (patch) | |
| tree | 282215a72d7ba3ba6d23d2de7ccb6c6fc07d425d /media | |
| parent | 2f694b3ef6af235e7ba850d57538eece9f136499 (diff) | |
| parent | c524ffda17017d8467a237a1eddfd7e7c03c6617 (diff) | |
| download | frameworks_av-898b11f2aeaaa2bed84d963a3fcfd3b229e00b99.zip frameworks_av-898b11f2aeaaa2bed84d963a3fcfd3b229e00b99.tar.gz frameworks_av-898b11f2aeaaa2bed84d963a3fcfd3b229e00b99.tar.bz2 | |
Merge "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, 44 insertions, 37 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 21e8f29..43008d4 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -3,47 +3,26 @@ 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:= \ - AudioTrack.cpp \ - IAudioFlinger.cpp \ - IAudioFlingerClient.cpp \ - IAudioTrack.cpp \ - IAudioRecord.cpp \ - AudioRecord.cpp \ - AudioSystem.cpp \ - mediaplayer.cpp \ - IMediaPlayerService.cpp \ + autodetect.cpp \ + IMediaDeathNotifier.cpp \ + IMediaMetadataRetriever.cpp \ IMediaPlayerClient.cpp \ - IMediaRecorderClient.cpp \ IMediaPlayer.cpp \ + IMediaPlayerService.cpp \ + IMediaRecorderClient.cpp \ IMediaRecorder.cpp \ + IOMX.cpp \ IStreamSource.cpp \ - Metadata.cpp \ - mediarecorder.cpp \ - IMediaMetadataRetriever.cpp \ - mediametadataretriever.cpp \ - ToneGenerator.cpp \ JetPlayer.cpp \ - IOMX.cpp \ - IAudioPolicyService.cpp \ - MediaScanner.cpp \ - MediaScannerClient.cpp \ - autodetect.cpp \ - IMediaDeathNotifier.cpp \ + mediametadataretriever.cpp \ + mediaplayer.cpp \ MediaProfiles.cpp \ - IEffect.cpp \ - IEffectClient.cpp \ - AudioEffect.cpp \ - Visualizer.cpp \ - MemoryLeakTrackUtil.cpp + mediarecorder.cpp \ + MediaScannerClient.cpp \ + MediaScanner.cpp \ + MemoryLeakTrackUtil.cpp \ + Metadata.cpp \ + Visualizer.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 065a90f..07f0978 100644 --- a/media/libmedia_native/Android.mk +++ b/media/libmedia_native/Android.mk @@ -1,11 +1,39 @@ -LOCAL_PATH := $(call my-dir) +# FIXME remove "/../libmedia" at same time as rename +LOCAL_PATH := $(call my-dir)/../libmedia include $(CLEAR_VARS) -LOCAL_SRC_FILES := +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_MODULE:= libmedia_native +LOCAL_C_INCLUDES := \ + $(call include-path-for, audio-utils) + LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) |