3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 22:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix googletest and googlemock in non-standalone mode after a45eea40fc81

Browse Source 
Change-Id: I24216fd2505a31cf939ad624e355460b31f7a40f
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2189916
Commit-Queue: Mark Mentovai <mark@chromium.org>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Mark Mentovai 2020-05-08 13:10:54 -04:00 committed by Commit Bot
parent 92530c67e9
commit c7d1d2a1dd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
third_party/googletest/BUILD.gn vendored
View File

@ -18,21 +18,21 @@ import("../../build/test.gni")
if (crashpad_is_in_chromium) { if (crashpad_is_in_chromium) {
group("googletest") { group("googletest") {
testonly = true testonly = true
public_deps = [ "//testing/googletest" ] public_deps = [ "//testing/gtest" ]
} }
group("googlemock") { group("googlemock") {
testonly = true testonly = true
public_deps = [ "//testing/googlemock" ] public_deps = [ "//testing/gmock" ]
} }
} else if (crashpad_is_in_dart || crashpad_is_in_fuchsia) { } else if (crashpad_is_in_dart || crashpad_is_in_fuchsia) {
group("googletest") { group("googletest") {
testonly = true testonly = true
public_deps = [ "//third_party/googletest:googletest" ] public_deps = [ "//third_party/googletest:gtest" ]
public_configs = [ "../..:disable_ubsan" ] public_configs = [ "../..:disable_ubsan" ]
} }
group("googlemock") { group("googlemock") {
testonly = true testonly = true
public_deps = [ "//third_party/googletest:googlemock" ] public_deps = [ "//third_party/googletest:gmock" ]
} }
} else if (crashpad_is_standalone) { } else if (crashpad_is_standalone) {
config("googletest_private_config") { config("googletest_private_config") {

2
third_party/googletest/googlemock.gyp vendored
View File

@ -24,7 +24,7 @@
'googlemock_dir': 'googletest/googlemock', 'googlemock_dir': 'googletest/googlemock',
}], }],
['crashpad_dependencies=="external"', { ['crashpad_dependencies=="external"', {
'googlemock_dir': '../../../../googlemock', 'googlemock_dir': '../../../../gmock',
}], }],
], ],
}, },

2
third_party/googletest/googletest.gyp vendored
View File

@ -24,7 +24,7 @@
'googletest_dir': 'googletest/googletest', 'googletest_dir': 'googletest/googletest',
}], }],
['crashpad_dependencies=="external"', { ['crashpad_dependencies=="external"', {
'googletest_dir': '../../../../googletest', 'googletest_dir': '../../../../gtest',
}], }],
], ],
}, },