summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/Android.mk
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-08-26 09:29:28 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-08-28 01:29:02 -0700
commit2e19c3c02957208371cdd491e6342ea7ddb440d9 (patch)
treeba960541c34212c11b10980f06e3afec8af35968 /services/camera/libcameraservice/Android.mk
parent2352a815fe99a00702dd00c5d1c6cfdfadba10fd (diff)
downloadframeworks_av-2e19c3c02957208371cdd491e6342ea7ddb440d9.zip
frameworks_av-2e19c3c02957208371cdd491e6342ea7ddb440d9.tar.gz
frameworks_av-2e19c3c02957208371cdd491e6342ea7ddb440d9.tar.bz2
Camera2: Factor out Camera2Client::Parameters
Move the parameter structure and the various utility methods using it to its own class. Rename LockedParameters to SharedParameters to match the Mutex naming convention. Also move CameraMetadata to camera2 directory for organization. No functional changes. Bug: 6243944 Change-Id: Ie60b535936ecfda9bf23361d52604abf515c83d0
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 079599a..391c319 100644
--- a/services/camera/libcameraservice/Android.mk
+++ b/services/camera/libcameraservice/Android.mk
@@ -11,7 +11,8 @@ LOCAL_SRC_FILES:= \
CameraClient.cpp \
Camera2Client.cpp \
Camera2Device.cpp \
- CameraMetadata.cpp
+ camera2/CameraMetadata.cpp \
+ camera2/Parameters.cpp
LOCAL_SHARED_LIBRARIES:= \
libui \