diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-09 17:46:37 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-02-11 13:16:22 -0800 |
| commit | 000479f9e325b4e426a67033abd92d47da412725 (patch) | |
| tree | 16b93ea777744aa24ffe7d3a191bb90529ad4ce5 /media/libmedia | |
| parent | 28a5dc229ed25c771cde25668928edc788073029 (diff) | |
| download | frameworks_base-000479f9e325b4e426a67033abd92d47da412725.zip frameworks_base-000479f9e325b4e426a67033abd92d47da412725.tar.gz frameworks_base-000479f9e325b4e426a67033abd92d47da412725.tar.bz2 | |
split libsurfaceflinger_client and libcamera_client out of libui
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/Android.mk | 2 | ||||
| -rw-r--r-- | media/libmedia/IMediaPlayer.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/IMediaRecorder.cpp | 4 | ||||
| -rw-r--r-- | media/libmedia/IOMX.cpp | 4 | ||||
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/mediarecorder.cpp | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index c59d323..3adabcc 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -29,7 +29,7 @@ LOCAL_SRC_FILES:= \ MediaProfiles.cpp LOCAL_SHARED_LIBRARIES := \ - libui libcutils libutils libbinder libsonivox libicuuc libexpat + libui libcutils libutils libbinder libsonivox libicuuc libexpat libsurfaceflinger_client libcamera_client LOCAL_MODULE:= libmedia diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index 5d9db10..9c127d4 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -21,7 +21,7 @@ #include <binder/Parcel.h> #include <media/IMediaPlayer.h> -#include <ui/ISurface.h> +#include <surfaceflinger/ISurface.h> namespace android { diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp index df7d301..2bc2a7e 100644 --- a/media/libmedia/IMediaRecorder.cpp +++ b/media/libmedia/IMediaRecorder.cpp @@ -19,8 +19,8 @@ #define LOG_TAG "IMediaRecorder" #include <utils/Log.h> #include <binder/Parcel.h> -#include <ui/ISurface.h> -#include <ui/ICamera.h> +#include <surfaceflinger/ISurface.h> +#include <camera/ICamera.h> #include <media/IMediaPlayerClient.h> #include <media/IMediaRecorder.h> diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp index 0469fd5..01b6737 100644 --- a/media/libmedia/IOMX.cpp +++ b/media/libmedia/IOMX.cpp @@ -5,8 +5,8 @@ #include <binder/IMemory.h> #include <binder/Parcel.h> #include <media/IOMX.h> -#include <ui/ISurface.h> -#include <ui/Surface.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/Surface.h> namespace android { diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index cb5ee4b..01cd8ce 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -30,6 +30,8 @@ #include <media/mediaplayer.h> #include <media/AudioTrack.h> +#include <surfaceflinger/Surface.h> + #include <binder/MemoryBase.h> #include <utils/KeyedVector.h> diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index 7b5dabb..23024e9 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "MediaRecorder" #include <utils/Log.h> -#include <ui/Surface.h> +#include <surfaceflinger/Surface.h> #include <media/mediarecorder.h> #include <binder/IServiceManager.h> #include <utils/String8.h> |