diff options
author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-03-19 17:27:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-19 17:27:53 +0000 |
commit | ae21e335e392125168601dba4731c85b5c25f33f (patch) | |
tree | 9fc3c0737d1391aa6aa9417b212275688cd3bd00 /camera/Android.mk | |
parent | 5a23aa949188fafe1d8d35966ff5a73974294dfd (diff) | |
parent | b97babb8c08969b55af3b6456d15f764c8873d3f (diff) | |
download | frameworks_av-ae21e335e392125168601dba4731c85b5c25f33f.zip frameworks_av-ae21e335e392125168601dba4731c85b5c25f33f.tar.gz frameworks_av-ae21e335e392125168601dba4731c85b5c25f33f.tar.bz2 |
Merge "Camera: plumbing rotation field through"
Diffstat (limited to 'camera/Android.mk')
-rw-r--r-- | camera/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index da5ac59..df7279f 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -35,6 +35,7 @@ LOCAL_SRC_FILES:= \ camera2/ICameraDeviceUser.cpp \ camera2/ICameraDeviceCallbacks.cpp \ camera2/CaptureRequest.cpp \ + camera2/OutputConfiguration.cpp \ ProCamera.cpp \ CameraBase.cpp \ CameraUtils.cpp \ |