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/jni | |
| 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/jni')
| -rw-r--r-- | media/jni/Android.mk | 4 | ||||
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 2 | ||||
| -rw-r--r-- | media/jni/android_media_MediaRecorder.cpp | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index d83f493..a6a25cd 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -21,7 +21,9 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libskia \ libui \ - libcutils + libcutils \ + libsurfaceflinger_client \ + libcamera_client ifneq ($(BUILD_WITHOUT_PV),true) diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 76d1674..2773e5c 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -35,7 +35,7 @@ #include "utils/String8.h" #include "android_util_Binder.h" #include <binder/Parcel.h> - +#include <surfaceflinger/Surface.h> // ---------------------------------------------------------------------------- diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index cad65b3..3063f15 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -18,9 +18,9 @@ #define LOG_TAG "MediaRecorderJNI" #include <utils/Log.h> -#include <ui/SurfaceComposerClient.h> -#include <ui/ICameraService.h> -#include <ui/Camera.h> +#include <surfaceflinger/SurfaceComposerClient.h> +#include <camera/ICameraService.h> +#include <camera/Camera.h> #include <media/mediarecorder.h> #include <stdio.h> #include <assert.h> |