summaryrefslogtreecommitdiffstats
path: root/camera/Android.mk
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-07-25 17:12:35 -0700
committerEino-Ville Talvala <etalvala@google.com>2013-07-30 10:58:44 -0700
commit7b82efe7a376c882f8f938e1c41b8311a8cdda4a (patch)
treed7ed69f0a495bc1a873a285ba11e72a9867c5565 /camera/Android.mk
parentd054c32443a493513ab63529b0c8b1aca290278c (diff)
downloadframeworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.zip
frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.tar.gz
frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.tar.bz2
Camera: Rename new API to camera2, rearrange camera service
- Support API rename from photography to camera2 - Reorganize camera service files - API support files to api1/, api2/, api_pro/ - HAL device support files into device{1,2,3}/ - Common files into common/ - Camera service remains at top-level Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9
Diffstat (limited to 'camera/Android.mk')
-rw-r--r--camera/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index 8f58f87..e633450 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -16,9 +16,9 @@ LOCAL_SRC_FILES:= \
ICameraRecordingProxyListener.cpp \
IProCameraUser.cpp \
IProCameraCallbacks.cpp \
- photography/ICameraDeviceUser.cpp \
- photography/ICameraDeviceCallbacks.cpp \
- photography/CaptureRequest.cpp \
+ camera2/ICameraDeviceUser.cpp \
+ camera2/ICameraDeviceCallbacks.cpp \
+ camera2/CaptureRequest.cpp \
ProCamera.cpp \
CameraBase.cpp \