Permalink
Browse files

split libsurfaceflinger_client and libcamera_client out of libui

  • Loading branch information...
Mathias Agopian
Mathias Agopian committed Feb 10, 2010
1 parent 094da15 commit 66ab03be39da8f4a374bf008ed118fae4b466d54
View
@@ -1,2 +1,15 @@
-LOCAL_SHARED_LIBRARIES := libutils libcutils libui libhardware libandroid_runtime libdrm1 libmedia libskia libvorbisidec libsonivox liblog libicuuc
+LOCAL_SHARED_LIBRARIES := libutils \
+ libcutils \
+ libui \
+ libhardware \
+ libandroid_runtime \
+ libdrm1 \
+ libmedia \
+ libskia \
+ libvorbisidec \
+ libsonivox \
+ liblog \
+ libicuuc \
+ libcamera_client \
+ libsurfaceflinger_client
View
@@ -38,7 +38,7 @@ endif
LOCAL_MODULE := libandroidpv
-LOCAL_SHARED_LIBRARIES := libui libutils libbinder
+LOCAL_SHARED_LIBRARIES := libui libutils libbinder libsurfaceflinger_client libcamera_client
LOCAL_STATIC_LIBRARIES := libosclbase libosclerror libosclmemory libosclutil
LOCAL_LDLIBS +=
@@ -19,7 +19,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "VideoMIO"
#include <utils/Log.h>
-#include <ui/ISurface.h>
+#include <surfaceflinger/ISurface.h>
#include "android_surface_output.h"
#include <media/PVPlayer.h>
@@ -48,7 +48,7 @@
//#include <linux/videodev.h>
// SurfaceFlinger
-#include <ui/ISurface.h>
+#include <surfaceflinger/ISurface.h>
// interprocess shared memory support
#include <binder/MemoryBase.h>
@@ -19,7 +19,7 @@
#include <utils/Log.h>
#include <media/PVMediaRecorder.h>
-#include <ui/ICamera.h>
+#include <camera/ICamera.h>
#include "authordriver.h"
namespace android {
@@ -18,12 +18,12 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "CameraInput"
#include <utils/Log.h>
-#include <ui/CameraParameters.h>
+#include <camera/CameraParameters.h>
#include <utils/Errors.h>
#include <media/mediarecorder.h>
-#include <ui/ISurface.h>
-#include <ui/ICamera.h>
-#include <ui/Camera.h>
+#include <surfaceflinger/ISurface.h>
+#include <camera/ICamera.h>
+#include <camera/Camera.h>
#include "pv_mime_string_utils.h"
#include "oscl_dll.h"
@@ -20,8 +20,8 @@
#include <unistd.h>
#include <media/thread_init.h>
-#include <ui/ISurface.h>
-#include <ui/ICamera.h>
+#include <surfaceflinger/ISurface.h>
+#include <camera/ICamera.h>
#include <cutils/properties.h> // for property_get
#include "authordriver.h"
#include "pv_omxcore.h"
@@ -28,7 +28,7 @@
#include <utils/List.h>
#include <utils/Errors.h>
-#include <ui/ICamera.h>
+#include <camera/ICamera.h>
#include <media/mediarecorder.h>
View
@@ -19,7 +19,7 @@
#define _PLAYERDRIVER_H
#include <cstring>
-#include <ui/ISurface.h>
+#include <surfaceflinger/ISurface.h>
#include <utils/Errors.h> // for android::status_t
#include <utils/RefBase.h> // for android::sp
#include <media/MediaPlayerInterface.h>

0 comments on commit 66ab03b

Please sign in to comment.