commit 61ab9f93315ea817cd1ac110e2a95da4dab6b4d1
author Eino-Ville Talvala <etalvala@google.com> Thu May 17 10:30:54 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Thu May 17 16:58:04 2012 -0700
tree 595ab34a38c8ece6155608553f7cba196a036786
parent 44631c2939369e66df7021b1f359ded319971d26

Camera service: Add skeleton support for camera2 devices.

- Add Camera2Client, which maps the current android.hardware.Camera
  API to the new camera2 semantics
- Add Camera2Device, a C++ wrapper for the HAL camera 2 device

No functionality besides create/destroy; all client methods return
error or null.

Bug: 6243944
Change-Id: I6bd5136fa1efd8279b8cd2d9847d9b0bb2862294

services/camera/libcameraservice/Android.mk

diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk
index 0022f2b..a2a7e57 100644
--- a/services/camera/libcameraservice/Android.mk
+++ b/services/camera/libcameraservice/Android.mk
@@ -8,7 +8,9 @@
 
 LOCAL_SRC_FILES:=               \
     CameraService.cpp \
-    CameraClient.cpp
+    CameraClient.cpp \
+    Camera2Client.cpp \
+    Camera2Device.cpp
 
 LOCAL_SHARED_LIBRARIES:= \
     libui \
@@ -21,6 +23,9 @@
     libgui \
     libhardware
 
+LOCAL_C_INCLUDES += \
+    system/media/camera/include
+
 LOCAL_MODULE:= libcameraservice
 
 include $(BUILD_SHARED_LIBRARY)