diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-05-17 10:30:54 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-05-17 16:58:04 -0700 |
| commit | 61ab9f93315ea817cd1ac110e2a95da4dab6b4d1 (patch) | |
| tree | 595ab34a38c8ece6155608553f7cba196a036786 /services/camera/libcameraservice/Android.mk | |
| parent | 44631c2939369e66df7021b1f359ded319971d26 (diff) | |
| download | frameworks_av-61ab9f93315ea817cd1ac110e2a95da4dab6b4d1.zip frameworks_av-61ab9f93315ea817cd1ac110e2a95da4dab6b4d1.tar.gz frameworks_av-61ab9f93315ea817cd1ac110e2a95da4dab6b4d1.tar.bz2 | |
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
Diffstat (limited to 'services/camera/libcameraservice/Android.mk')
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ CameraService.cpp \ - CameraClient.cpp + CameraClient.cpp \ + Camera2Client.cpp \ + Camera2Device.cpp LOCAL_SHARED_LIBRARIES:= \ libui \ @@ -21,6 +23,9 @@ LOCAL_SHARED_LIBRARIES:= \ libgui \ libhardware +LOCAL_C_INCLUDES += \ + system/media/camera/include + LOCAL_MODULE:= libcameraservice include $(BUILD_SHARED_LIBRARY) |