From 6f3beba5e01780c30364e34be15335da51c4e0e5 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 14 Mar 2025 18:00:37 +0000 Subject: Move more path logic for tests to testing.cc, so it can be used without depending on CommonArtTest. Preparation to fix the libart-gtest dependency in art_standalone_libartpalette_tests. Due to a new #include, this necessitated fixing a bunch of `testing` namespace references that could become ambigious wrt `art::testing`. Test: m generate-boot-image Test: art/tools/buildbot-build.sh Bug: 404306250 Change-Id: Iafb3d73148125775c9c5ddbcbaef39dc61859118 --- libnativeloader/native_loader_api_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libnativeloader/native_loader_api_test.cpp') diff --git a/libnativeloader/native_loader_api_test.cpp b/libnativeloader/native_loader_api_test.cpp index aeda1cc2a7..6ef7d36134 100644 --- a/libnativeloader/native_loader_api_test.cpp +++ b/libnativeloader/native_loader_api_test.cpp @@ -38,7 +38,7 @@ using ::testing::StrEq; class NativeLoaderLazyTest : public ::testing::Test { protected: void SetUp() override { - jni_mock = std::make_unique>(); + jni_mock = std::make_unique<::testing::NiceMock>(); env = std::make_unique(); env->functions = CreateJNINativeInterface(); } -- cgit v1.2.3-59-g8ed1b