Merge "Fix build break for camera.v4l2_test" into main am: da7cdc6943 am: 085358d406
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/3254292
Change-Id: Iff8e03e05dd769e9673efb0098731e0c848025b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/modules/camera/3_4/format_metadata_factory_test.cpp b/modules/camera/3_4/format_metadata_factory_test.cpp
index 65d4415..165743d 100644
--- a/modules/camera/3_4/format_metadata_factory_test.cpp
+++ b/modules/camera/3_4/format_metadata_factory_test.cpp
@@ -24,6 +24,7 @@
#include "v4l2_wrapper_mock.h"
using testing::AtLeast;
+using testing::DoAll;
using testing::Expectation;
using testing::Return;
using testing::SetArgPointee;
diff --git a/modules/camera/3_4/metadata/control_test.cpp b/modules/camera/3_4/metadata/control_test.cpp
index 6284330..c68958f 100644
--- a/modules/camera/3_4/metadata/control_test.cpp
+++ b/modules/camera/3_4/metadata/control_test.cpp
@@ -26,6 +26,7 @@
#include "test_common.h"
using testing::AtMost;
+using testing::DoAll;
using testing::Expectation;
using testing::Return;
using testing::SetArgPointee;
diff --git a/modules/camera/3_4/metadata/map_converter_test.cpp b/modules/camera/3_4/metadata/map_converter_test.cpp
index 0361810..87fbe20 100644
--- a/modules/camera/3_4/metadata/map_converter_test.cpp
+++ b/modules/camera/3_4/metadata/map_converter_test.cpp
@@ -21,6 +21,7 @@
#include "converter_interface_mock.h"
+using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
diff --git a/modules/camera/3_4/metadata/menu_control_options_test.cpp b/modules/camera/3_4/metadata/menu_control_options_test.cpp
index b8eea74..560d55f 100644
--- a/modules/camera/3_4/metadata/menu_control_options_test.cpp
+++ b/modules/camera/3_4/metadata/menu_control_options_test.cpp
@@ -23,6 +23,7 @@
#include <hardware/camera3.h>
#include "default_option_delegate_mock.h"
+using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
diff --git a/modules/camera/3_4/metadata/partial_metadata_factory_test.cpp b/modules/camera/3_4/metadata/partial_metadata_factory_test.cpp
index f039b54..433f539 100644
--- a/modules/camera/3_4/metadata/partial_metadata_factory_test.cpp
+++ b/modules/camera/3_4/metadata/partial_metadata_factory_test.cpp
@@ -26,6 +26,7 @@
#include "v4l2_wrapper_mock.h"
using testing::AtMost;
+using testing::DoAll;
using testing::Expectation;
using testing::Return;
using testing::SetArgPointee;
diff --git a/modules/camera/3_4/metadata/ranged_converter_test.cpp b/modules/camera/3_4/metadata/ranged_converter_test.cpp
index 2b5ccc6..f4048fe 100644
--- a/modules/camera/3_4/metadata/ranged_converter_test.cpp
+++ b/modules/camera/3_4/metadata/ranged_converter_test.cpp
@@ -21,6 +21,7 @@
#include "converter_interface_mock.h"
+using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
diff --git a/modules/camera/3_4/metadata/slider_control_options_test.cpp b/modules/camera/3_4/metadata/slider_control_options_test.cpp
index 7f3a643..5c5aec8 100644
--- a/modules/camera/3_4/metadata/slider_control_options_test.cpp
+++ b/modules/camera/3_4/metadata/slider_control_options_test.cpp
@@ -23,6 +23,7 @@
#include <hardware/camera3.h>
#include "default_option_delegate_mock.h"
+using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
diff --git a/modules/camera/3_4/metadata/state_test.cpp b/modules/camera/3_4/metadata/state_test.cpp
index ecc1d15..61333ac 100644
--- a/modules/camera/3_4/metadata/state_test.cpp
+++ b/modules/camera/3_4/metadata/state_test.cpp
@@ -25,6 +25,7 @@
#include "test_common.h"
using testing::AtMost;
+using testing::DoAll;
using testing::Expectation;
using testing::Return;
using testing::SetArgPointee;
diff --git a/modules/camera/3_4/metadata/tagged_control_delegate_test.cpp b/modules/camera/3_4/metadata/tagged_control_delegate_test.cpp
index ba29ab7..73118e2 100644
--- a/modules/camera/3_4/metadata/tagged_control_delegate_test.cpp
+++ b/modules/camera/3_4/metadata/tagged_control_delegate_test.cpp
@@ -21,6 +21,7 @@
#include "control_delegate_interface_mock.h"
+using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
diff --git a/modules/camera/3_4/metadata/tagged_control_options_test.cpp b/modules/camera/3_4/metadata/tagged_control_options_test.cpp
index 845426a..6ae72a1 100644
--- a/modules/camera/3_4/metadata/tagged_control_options_test.cpp
+++ b/modules/camera/3_4/metadata/tagged_control_options_test.cpp
@@ -21,6 +21,7 @@
#include "control_options_interface_mock.h"
+using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
diff --git a/modules/camera/3_4/metadata/v4l2_control_delegate_test.cpp b/modules/camera/3_4/metadata/v4l2_control_delegate_test.cpp
index 63ad0f6..6c8bef0 100644
--- a/modules/camera/3_4/metadata/v4l2_control_delegate_test.cpp
+++ b/modules/camera/3_4/metadata/v4l2_control_delegate_test.cpp
@@ -21,6 +21,7 @@
#include "converter_interface_mock.h"
#include "v4l2_wrapper_mock.h"
+using testing::DoAll;
using testing::Return;
using testing::SetArgPointee;
using testing::Test;
diff --git a/modules/camera/3_4/static_properties_test.cpp b/modules/camera/3_4/static_properties_test.cpp
index 13b9e96..abbff87 100644
--- a/modules/camera/3_4/static_properties_test.cpp
+++ b/modules/camera/3_4/static_properties_test.cpp
@@ -24,6 +24,7 @@
#include "metadata/metadata_reader_mock.h"
using testing::AtMost;
+using testing::DoAll;
using testing::Expectation;
using testing::Return;
using testing::SetArgPointee;