commit ab7b1f3eae33cd86b524a427c2efe67b615c2c45
author Austin Borger <borgera@google.com> Mon Dec 13 23:50:25 2021 +0000
committer Austin Borger <borgera@google.com> Wed Jan 05 21:09:04 2022 +0000
tree 819a1aec021f869e73bd6045cb4337f03d248976
parent 0c9eee2e5a141f3146ee7841825dc23a8d168040

cameraservice_test: Add ZoomRatioTest to the host build.

ZoomRatioTest requires getArrayWidthAndHeight, which has been added in
this patch to SessionConfigurationUtilsHost.cpp.

Bug: 207411352
Test: Ran test on gLinux.
Change-Id: Ie1cd954cc49ab0f3bb80bd2fbe82397689c25dd2

services/camera/libcameraservice/Android.bp

diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 7ef5d4f..ec213b9 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -76,7 +76,6 @@
         "device3/StatusTracker.cpp",
         "device3/Camera3BufferManager.cpp",
         "device3/Camera3StreamSplitter.cpp",
-        "device3/ZoomRatioMapper.cpp",
         "device3/Camera3OutputStreamInterface.cpp",
         "device3/Camera3OutputUtils.cpp",
         "device3/Camera3DeviceInjectionMethods.cpp",
@@ -201,6 +200,7 @@
         "device3/CoordinateMapper.cpp",
         "device3/DistortionMapper.cpp",
         "device3/RotateAndCropMapper.cpp",
+        "device3/ZoomRatioMapper.cpp",
         "utils/ExifUtils.cpp",
         "utils/SessionConfigurationUtilsHost.cpp",
     ],