summaryrefslogtreecommitdiffstats
path: root/camera/Android.mk
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-03-18 18:15:23 -0700
committerEino-Ville Talvala <etalvala@google.com>2014-08-18 16:52:27 -0700
commit0b88a62d4d5ac1e515721e587cdf9bcec191812b (patch)
treefed446ae00af008008f80041651adb1e0af319ae /camera/Android.mk
parent475da7ef08c05a482ced8d318832cf5aa1141aff (diff)
downloadframeworks_av-0b88a62d4d5ac1e515721e587cdf9bcec191812b.zip
frameworks_av-0b88a62d4d5ac1e515721e587cdf9bcec191812b.tar.gz
frameworks_av-0b88a62d4d5ac1e515721e587cdf9bcec191812b.tar.bz2
camera: Fix setParameters for Preview FPS single/range values
As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Bug: 16654949 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
Diffstat (limited to 'camera/Android.mk')
-rw-r--r--camera/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index bbdb47d..da5ac59 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES:= \
CameraMetadata.cpp \
CameraParameters.cpp \
CaptureResult.cpp \
+ CameraParameters2.cpp \
ICamera.cpp \
ICameraClient.cpp \
ICameraService.cpp \