Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5a665ea authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "cameraservice_test: Add DistortionMapperTest to the host build."

parents 95ca885c ea931248

services/camera/libcameraservice/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ cc_library_shared { 
        "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 @@ cc_library_static { 
    // Camera service source



    srcs: [

        "device3/CoordinateMapper.cpp",

        "device3/DistortionMapper.cpp",

        "utils/ExifUtils.cpp",

        "utils/SessionConfigurationUtilsHost.cpp",

    ],



    shared_libs: [

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ namespace android { 


using base::StringPrintf;

using binder::Status;

using camera3::SessionConfigurationUtils;

using namespace camera3;

using frameworks::cameraservice::service::V2_0::implementation::HidlCameraService;

using hardware::ICamera;

using hardware::ICameraClient;

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 


namespace android {

using namespace camera2;

using namespace camera3;

using camera3::camera_stream_rotation_t::CAMERA_STREAM_ROTATION_0;

using camera3::SessionConfigurationUtils;



CameraDeviceClientBase::CameraDeviceClientBase(

        const sp<CameraService>& cameraService,

services/camera/libcameraservice/common/CameraProviderManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ namespace android { 


using namespace ::android::hardware::camera;

using namespace ::android::hardware::camera::common::V1_0;

using camera3::SessionConfigurationUtils;

using namespace ::android::camera3;

using std::literals::chrono_literals::operator""s;

using hardware::camera2::utils::CameraIdAndSessionConfiguration;

using hardware::camera::provider::V2_7::CameraIdAndStreamCombination;

services/camera/libcameraservice/device3/DistortionMapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <cmath>



#include "device3/DistortionMapper.h"

#include "utils/SessionConfigurationUtils.h"

#include "utils/SessionConfigurationUtilsHost.h"



namespace android {