summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader_api_test.cpp
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2025-03-14 18:00:37 +0000
committer Martin Stjernholm <mast@google.com> 2025-03-20 15:50:43 -0700
commit6f3beba5e01780c30364e34be15335da51c4e0e5 (patch)
tree1f7fcdeefd53e4601a5ad585f9da0765870ce483 /libnativeloader/native_loader_api_test.cpp
parent8badd481972993739e7711258f03a44638ca87a5 (diff)
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
Diffstat (limited to 'libnativeloader/native_loader_api_test.cpp')
-rw-r--r--libnativeloader/native_loader_api_test.cpp2
1 files changed, 1 insertions, 1 deletions
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<testing::NiceMock<MockJni>>();
+ jni_mock = std::make_unique<::testing::NiceMock<MockJni>>();
env = std::make_unique<JNIEnv>();
env->functions = CreateJNINativeInterface();
}