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 /camera | |
| 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 'camera')
| -rw-r--r-- | camera/libcameraservice/Android.mk | 4 | ||||
| -rw-r--r-- | camera/libcameraservice/CameraHardwareStub.h | 2 | ||||
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 4 | ||||
| -rw-r--r-- | camera/libcameraservice/CameraService.h | 6 | ||||
| -rw-r--r-- | camera/tests/CameraServiceTest/Android.mk | 4 | ||||
| -rw-r--r-- | camera/tests/CameraServiceTest/CameraServiceTest.cpp | 12 |
6 files changed, 19 insertions, 13 deletions
diff --git a/camera/libcameraservice/Android.mk b/camera/libcameraservice/Android.mk index ecaebff..df5c166 100644 --- a/camera/libcameraservice/Android.mk +++ b/camera/libcameraservice/Android.mk @@ -48,7 +48,9 @@ LOCAL_SHARED_LIBRARIES:= \ libutils \ libbinder \ libcutils \ - libmedia + libmedia \ + libcamera_client \ + libsurfaceflinger_client LOCAL_MODULE:= libcameraservice diff --git a/camera/libcameraservice/CameraHardwareStub.h b/camera/libcameraservice/CameraHardwareStub.h index 8a67024..957813a4 100644 --- a/camera/libcameraservice/CameraHardwareStub.h +++ b/camera/libcameraservice/CameraHardwareStub.h @@ -20,7 +20,7 @@ #include "FakeCamera.h" #include <utils/threads.h> -#include <ui/CameraHardwareInterface.h> +#include <camera/CameraHardwareInterface.h> #include <binder/MemoryBase.h> #include <binder/MemoryHeapBase.h> #include <utils/threads.h> diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 405d471..86a6fac 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -25,7 +25,9 @@ #include <utils/Errors.h> #include <binder/MemoryBase.h> #include <binder/MemoryHeapBase.h> -#include <ui/ICameraService.h> +#include <camera/ICameraService.h> +#include <surfaceflinger/ISurface.h> +#include <ui/Overlay.h> #include <media/mediaplayer.h> #include <media/AudioSystem.h> diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h index b3d20f6..bc49b1d 100644 --- a/camera/libcameraservice/CameraService.h +++ b/camera/libcameraservice/CameraService.h @@ -19,9 +19,9 @@ #ifndef ANDROID_SERVERS_CAMERA_CAMERASERVICE_H #define ANDROID_SERVERS_CAMERA_CAMERASERVICE_H -#include <ui/ICameraService.h> -#include <ui/CameraHardwareInterface.h> -#include <ui/Camera.h> +#include <camera/ICameraService.h> +#include <camera/CameraHardwareInterface.h> +#include <camera/Camera.h> namespace android { diff --git a/camera/tests/CameraServiceTest/Android.mk b/camera/tests/CameraServiceTest/Android.mk index 8da7c1f..9bb190a 100644 --- a/camera/tests/CameraServiceTest/Android.mk +++ b/camera/tests/CameraServiceTest/Android.mk @@ -17,6 +17,8 @@ LOCAL_SHARED_LIBRARIES += \ libbinder \ libcutils \ libutils \ - libui + libui \ + libcamera_client \ + libsurfaceflinger_client include $(BUILD_EXECUTABLE) diff --git a/camera/tests/CameraServiceTest/CameraServiceTest.cpp b/camera/tests/CameraServiceTest/CameraServiceTest.cpp index f89d9d3..9fc795b 100644 --- a/camera/tests/CameraServiceTest/CameraServiceTest.cpp +++ b/camera/tests/CameraServiceTest/CameraServiceTest.cpp @@ -6,13 +6,13 @@ #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> -#include <ui/ISurface.h> -#include <ui/Camera.h> -#include <ui/CameraParameters.h> +#include <surfaceflinger/ISurface.h> +#include <camera/Camera.h> +#include <camera/CameraParameters.h> #include <ui/GraphicBuffer.h> -#include <ui/ICamera.h> -#include <ui/ICameraClient.h> -#include <ui/ICameraService.h> +#include <camera/ICamera.h> +#include <camera/ICameraClient.h> +#include <camera/ICameraService.h> #include <ui/Overlay.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> |