diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-19 19:08:10 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-20 12:55:03 -0700 |
| commit | c5b2c0bf8007562536b822eb060fc54a01f8e08b (patch) | |
| tree | da6084f542177972cf72a985b5d2c10330f87de3 /camera/libcameraservice | |
| parent | 208059f67ed2dd9fa025e07fcb6954d3cb61c79e (diff) | |
| download | frameworks_native-c5b2c0bf8007562536b822eb060fc54a01f8e08b.zip frameworks_native-c5b2c0bf8007562536b822eb060fc54a01f8e08b.tar.gz frameworks_native-c5b2c0bf8007562536b822eb060fc54a01f8e08b.tar.bz2 | |
move libbinder's header files under includes/binder
Diffstat (limited to 'camera/libcameraservice')
| -rw-r--r-- | camera/libcameraservice/CameraHardwareStub.h | 4 | ||||
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/camera/libcameraservice/CameraHardwareStub.h b/camera/libcameraservice/CameraHardwareStub.h index 0d26d47..efae935 100644 --- a/camera/libcameraservice/CameraHardwareStub.h +++ b/camera/libcameraservice/CameraHardwareStub.h @@ -21,8 +21,8 @@ #include "FakeCamera.h" #include <utils/threads.h> #include <ui/CameraHardwareInterface.h> -#include <utils/MemoryBase.h> -#include <utils/MemoryHeapBase.h> +#include <binder/MemoryBase.h> +#include <binder/MemoryHeapBase.h> #include <utils/threads.h> namespace android { diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index f85ea9f..4f0fe21 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -20,12 +20,12 @@ #define LOG_TAG "CameraService" #include <utils/Log.h> -#include <utils/IServiceManager.h> -#include <utils/IPCThreadState.h> +#include <binder/IServiceManager.h> +#include <binder/IPCThreadState.h> #include <utils/String16.h> #include <utils/Errors.h> -#include <utils/MemoryBase.h> -#include <utils/MemoryHeapBase.h> +#include <binder/MemoryBase.h> +#include <binder/MemoryHeapBase.h> #include <ui/ICameraService.h> #include <media/mediaplayer.h> |