cameraservice_test: Add DistortionMapperTest to the host build.
DistortionMapperTest depends on SessionConfigurationUtils, but uses
parts of it that do not rely on a HAL or other device-side information
(components in the android::hardware namespace). This change splits up
SessionConfiguration utils into two files so that functions that do not
rely on a HAL are not bundled with those that do.
Bug: 207411352
Test: Ran test on gLinux.
Change-Id: Iaeeab4ee68044984425a9918a58aa6ce18fc8de4
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 2555c30..b589c85 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -76,8 +76,6 @@
"device3/StatusTracker.cpp",
"device3/Camera3BufferManager.cpp",
"device3/Camera3StreamSplitter.cpp",
- "device3/CoordinateMapper.cpp",
- "device3/DistortionMapper.cpp",
"device3/ZoomRatioMapper.cpp",
"device3/RotateAndCropMapper.cpp",
"device3/Camera3OutputStreamInterface.cpp",
@@ -201,7 +199,10 @@
// Camera service source
srcs: [
+ "device3/CoordinateMapper.cpp",
+ "device3/DistortionMapper.cpp",
"utils/ExifUtils.cpp",
+ "utils/SessionConfigurationUtilsHost.cpp",
],
shared_libs: [