From c7d1d2a1dd7cf2442cbb8aa8da7348fa01d54182 Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Fri, 8 May 2020 13:10:54 -0400 Subject: [PATCH] Fix googletest and googlemock in non-standalone mode after a45eea40fc81 Change-Id: I24216fd2505a31cf939ad624e355460b31f7a40f Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2189916 Commit-Queue: Mark Mentovai Reviewed-by: Joshua Peraza --- third_party/googletest/BUILD.gn | 8 ++++---- third_party/googletest/googlemock.gyp | 2 +- third_party/googletest/googletest.gyp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index de2d26a1..475ad666 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -18,21 +18,21 @@ import("../../build/test.gni") if (crashpad_is_in_chromium) { group("googletest") { testonly = true - public_deps = [ "//testing/googletest" ] + public_deps = [ "//testing/gtest" ] } group("googlemock") { testonly = true - public_deps = [ "//testing/googlemock" ] + public_deps = [ "//testing/gmock" ] } } else if (crashpad_is_in_dart || crashpad_is_in_fuchsia) { group("googletest") { testonly = true - public_deps = [ "//third_party/googletest:googletest" ] + public_deps = [ "//third_party/googletest:gtest" ] public_configs = [ "../..:disable_ubsan" ] } group("googlemock") { testonly = true - public_deps = [ "//third_party/googletest:googlemock" ] + public_deps = [ "//third_party/googletest:gmock" ] } } else if (crashpad_is_standalone) { config("googletest_private_config") { diff --git a/third_party/googletest/googlemock.gyp b/third_party/googletest/googlemock.gyp index f49141dc..371f5a39 100644 --- a/third_party/googletest/googlemock.gyp +++ b/third_party/googletest/googlemock.gyp @@ -24,7 +24,7 @@ 'googlemock_dir': 'googletest/googlemock', }], ['crashpad_dependencies=="external"', { - 'googlemock_dir': '../../../../googlemock', + 'googlemock_dir': '../../../../gmock', }], ], }, diff --git a/third_party/googletest/googletest.gyp b/third_party/googletest/googletest.gyp index dc4f6612..ad79eb78 100644 --- a/third_party/googletest/googletest.gyp +++ b/third_party/googletest/googletest.gyp @@ -24,7 +24,7 @@ 'googletest_dir': 'googletest/googletest', }], ['crashpad_dependencies=="external"', { - 'googletest_dir': '../../../../googletest', + 'googletest_dir': '../../../../gtest', }], ], },