diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-01 17:48:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-01 17:48:57 +0000 |
| commit | d24b0653c7620e07e92308c05b41f7df9943f83b (patch) | |
| tree | 3fc64f5f5ea0ce161a14f6ebd2cb7a7d299ad8ec /services/camera/libcameraservice/Android.mk | |
| parent | d8c7ad1cbc2e6830560a085380a5828cc3d41010 (diff) | |
| parent | ae500e53efa1d26eb7c13e62d0ecc8d75db2473a (diff) | |
| download | frameworks_av-d24b0653c7620e07e92308c05b41f7df9943f83b.zip frameworks_av-d24b0653c7620e07e92308c05b41f7df9943f83b.tar.gz frameworks_av-d24b0653c7620e07e92308c05b41f7df9943f83b.tar.bz2 | |
Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
* changes:
Camera3: Add ZSL stream support
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Camera3: Add input stream support
Diffstat (limited to 'services/camera/libcameraservice/Android.mk')
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index 3c84703..3479553 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -25,10 +25,12 @@ LOCAL_SRC_FILES:= \ camera2/JpegCompressor.cpp \ camera2/CaptureSequencer.cpp \ camera2/ProFrameProcessor.cpp \ + camera2/ZslProcessor3.cpp \ camera3/Camera3Stream.cpp \ camera3/Camera3InputStream.cpp \ camera3/Camera3OutputStream.cpp \ - camera3/Camera3ZslStream.cpp + camera3/Camera3ZslStream.cpp \ + gui/RingBufferConsumer.cpp \ LOCAL_SHARED_LIBRARIES:= \ libui \ |