diff options
| author | Igor Murashkin <iam@google.com> | 2013-10-30 14:16:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-30 14:16:18 -0700 |
| commit | 34790c866cdc309e3779b811db43f63aa7eae7ef (patch) | |
| tree | 80ea1830666a23719f352fad922e5e7766da9a8a /services/camera/libcameraservice/Android.mk | |
| parent | 8578eb364799f83c6f237d286e1447c02db6afbc (diff) | |
| parent | 3ff5792adfdbf67662a5f8064315a55690d53944 (diff) | |
| download | frameworks_av-34790c866cdc309e3779b811db43f63aa7eae7ef.zip frameworks_av-34790c866cdc309e3779b811db43f63aa7eae7ef.tar.gz frameworks_av-34790c866cdc309e3779b811db43f63aa7eae7ef.tar.bz2 | |
am 3ff5792a: Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
* commit '3ff5792adfdbf67662a5f8064315a55690d53944':
camera: Collect stack traces when bad things happen, print with dumpsys
Diffstat (limited to 'services/camera/libcameraservice/Android.mk')
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index d23f8b9..51ba698 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -35,6 +35,7 @@ LOCAL_SRC_FILES:= \ device3/Camera3ZslStream.cpp \ device3/StatusTracker.cpp \ gui/RingBufferConsumer.cpp \ + utils/CameraTraces.cpp \ LOCAL_SHARED_LIBRARIES:= \ libui \ |