commit 7b82efe7a376c882f8f938e1c41b8311a8cdda4a
author Eino-Ville Talvala <etalvala@google.com> Thu Jul 25 17:12:35 2013 -0700
committer Eino-Ville Talvala <etalvala@google.com> Tue Jul 30 10:58:44 2013 -0700
tree d7ed69f0a495bc1a873a285ba11e72a9867c5565
parent d054c32443a493513ab63529b0c8b1aca290278c

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

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 0eb3e32..359b3ca 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -38,10 +38,10 @@
 #include <utils/String16.h>
 
 #include "CameraService.h"
-#include "CameraClient.h"
-#include "Camera2Client.h"
-#include "ProCamera2Client.h"
-#include "photography/CameraDeviceClient.h"
+#include "api1/CameraClient.h"
+#include "api1/Camera2Client.h"
+#include "api_pro/ProCamera2Client.h"
+#include "api2/CameraDeviceClient.h"
 #include "CameraDeviceFactory.h"
 
 namespace android {