diff options
| author | Andreas Huber <andih@google.com> | 2009-12-03 11:31:19 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2009-12-03 13:21:54 -0800 |
| commit | bfb9fb143b67c2d0307af2bce9af3c08f362b29a (patch) | |
| tree | 6b22297ab9749e2c86d3ae4844a7bad884027118 /media/libmediaplayerservice | |
| parent | d345c6acedb22c9408553ef9f38c196984177e6b (diff) | |
| download | frameworks_base-bfb9fb143b67c2d0307af2bce9af3c08f362b29a.zip frameworks_base-bfb9fb143b67c2d0307af2bce9af3c08f362b29a.tar.gz frameworks_base-bfb9fb143b67c2d0307af2bce9af3c08f362b29a.tar.bz2 | |
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 10 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaRecorderClient.cpp | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 4784b8e..b8defde 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -37,13 +37,19 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libvorbisidec \ libsonivox \ - libopencore_player \ - libopencore_author \ libmedia \ libandroid_runtime \ libstagefright \ libstagefright_omx +ifneq ($(BUILD_WITHOUT_PV),true) +LOCAL_SHARED_LIBRARIES += \ + libopencore_player \ + libopencore_author +else +LOCAL_CFLAGS += -DNO_OPENCORE +endif + ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl endif diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index 2ea7cc3..c507669 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -30,7 +30,11 @@ #include <binder/IServiceManager.h> #include <binder/MemoryHeapBase.h> #include <binder/MemoryBase.h> + +#ifndef NO_OPENCORE #include <media/PVMediaRecorder.h> +#endif + #include <utils/String16.h> #include <media/AudioTrack.h> @@ -297,9 +301,15 @@ MediaRecorderClient::MediaRecorderClient(const sp<MediaPlayerService>& service, mRecorder = new StagefrightRecorder; } else #endif +#ifndef NO_OPENCORE { mRecorder = new PVMediaRecorder(); } +#else + { + mRecorder = NULL; + } +#endif mMediaPlayerService = service; } |