diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-07-25 17:12:35 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-07-30 10:58:44 -0700 |
| commit | 7b82efe7a376c882f8f938e1c41b8311a8cdda4a (patch) | |
| tree | d7ed69f0a495bc1a873a285ba11e72a9867c5565 /services/camera/libcameraservice/CameraDeviceFactory.cpp | |
| parent | d054c32443a493513ab63529b0c8b1aca290278c (diff) | |
| download | frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.zip frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.tar.gz frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.tar.bz2 | |
Camera: Rename new API to camera2, rearrange camera service
- Support API rename from photography to camera2
- Reorganize camera service files
- API support files to api1/, api2/, api_pro/
- HAL device support files into device{1,2,3}/
- Common files into common/
- Camera service remains at top-level
Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9
Diffstat (limited to 'services/camera/libcameraservice/CameraDeviceFactory.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraDeviceFactory.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/CameraDeviceFactory.cpp b/services/camera/libcameraservice/CameraDeviceFactory.cpp index 2acdb5e..7fdf304 100644 --- a/services/camera/libcameraservice/CameraDeviceFactory.cpp +++ b/services/camera/libcameraservice/CameraDeviceFactory.cpp @@ -18,11 +18,11 @@ #define LOG_TAG "CameraDeviceFactory" #include <utils/Log.h> -#include "CameraDeviceBase.h" -#include "Camera2Device.h" -#include "Camera3Device.h" #include "CameraService.h" #include "CameraDeviceFactory.h" +#include "common/CameraDeviceBase.h" +#include "device2/Camera2Device.h" +#include "device3/Camera3Device.h" namespace android { @@ -69,4 +69,3 @@ void CameraDeviceFactory::registerService(wp<CameraService> service) { } }; // namespace android - |