summaryrefslogtreecommitdiffstats
path: root/camera/Android.mk
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-02-13 15:53:56 -0800
committerIgor Murashkin <iam@google.com>2013-02-22 10:50:14 -0800
commit7efa520c76e6a1f6b3146404cc6aca5a8353583a (patch)
treedb2c59948bb0c344584706d6b6e36c86a42d9abf /camera/Android.mk
parent99c2f923f6b04efffe949d1daf9cb7148e3cc201 (diff)
downloadframeworks_av-7efa520c76e6a1f6b3146404cc6aca5a8353583a.zip
frameworks_av-7efa520c76e6a1f6b3146404cc6aca5a8353583a.tar.gz
frameworks_av-7efa520c76e6a1f6b3146404cc6aca5a8353583a.tar.bz2
Camera: Move CameraMetadata.h from service to client library
Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f
Diffstat (limited to 'camera/Android.mk')
-rw-r--r--camera/Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index 7286f92..b66105b 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -3,6 +3,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
Camera.cpp \
+ CameraMetadata.cpp \
CameraParameters.cpp \
ICamera.cpp \
ICameraClient.cpp \
@@ -16,7 +17,11 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \
libhardware \
libui \
- libgui
+ libgui \
+ libcamera_metadata \
+
+LOCAL_C_INCLUDES += \
+ system/media/camera/include
LOCAL_MODULE:= libcamera_client