summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/Android.mk
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-05-20 15:59:14 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-05-29 13:47:50 -0700
commitf69c70ded4316ea3ee504ac779bd024433ed4ef7 (patch)
tree35a9f7b23fff4fb40321cf4c009d268bed27bea8 /services/camera/libcameraservice/Android.mk
parentdd72c3017aef65d099460cfc6c0402bc2ba85bc3 (diff)
downloadframeworks_av-f69c70ded4316ea3ee504ac779bd024433ed4ef7.zip
frameworks_av-f69c70ded4316ea3ee504ac779bd024433ed4ef7.tar.gz
frameworks_av-f69c70ded4316ea3ee504ac779bd024433ed4ef7.tar.bz2
Camera service: Initialization for camera2 clients and devices
- Refactor initialization code to hide device type from CameraService - Add metadata queue class to Camera2Device - Initialization of Camera2Device, Camera2Client - Conversion from HAL2 device static metadata to camera API parameters. Bug: 6243944 Change-Id: I524145b45438e906d8493dae202704ce8f090aeb
Diffstat (limited to 'services/camera/libcameraservice/Android.mk')
-rw-r--r--services/camera/libcameraservice/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk
index a2a7e57..9f713fa 100644
--- a/services/camera/libcameraservice/Android.mk
+++ b/services/camera/libcameraservice/Android.mk
@@ -21,7 +21,8 @@ LOCAL_SHARED_LIBRARIES:= \
libmedia_native \
libcamera_client \
libgui \
- libhardware
+ libhardware \
+ libcamera_metadata
LOCAL_C_INCLUDES += \
system/media/camera/include