diff options
| author | Jordan Bayles <jophba@chromium.org> | 2021-06-22 11:28:50 -0700 |
|---|---|---|
| committer | Openscreen LUCI CQ <openscreen-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2021-06-24 02:35:56 +0000 |
| commit | f3b911c8dbd011a8f96802ad6e3a4998799ebd9c (patch) | |
| tree | 75044e00a7e4033bf8005222426d19c1a91e0773 /third_party/googletest | |
| parent | 5139930c36d7f9e6949bbd5d9ec254aa111683d8 (diff) | |
| download | openscreen-f3b911c8dbd011a8f96802ad6e3a4998799ebd9c.tar.gz | |
Fix GN check issues
This patch fixes various issues found through `gn check` throughout the
repository, including some fuzzing issues.
Bug: b/155434332
Change-Id: I2dffa42f5dfd291a7c59653eb7ca16ec680bfddb
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2964569
Reviewed-by: Ryan Keane <rwkeane@google.com>
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'third_party/googletest')
| -rw-r--r-- | third_party/googletest/BUILD.gn | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index 27006582..93705bbf 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -11,9 +11,7 @@ if (build_with_chromium) { "//build/config/compiler:default_include_dirs", "../../build:openscreen_include_dirs", ] - public_deps = [ - "//third_party/googletest:gmock", - ] + public_deps = [ "//third_party/googletest:gmock" ] } source_set("gtest") { @@ -22,9 +20,7 @@ if (build_with_chromium) { "//build/config/compiler:default_include_dirs", "../../build:openscreen_include_dirs", ] - public_deps = [ - "//third_party/googletest:gtest", - ] + public_deps = [ "//third_party/googletest:gtest" ] } source_set("gtest_main") { @@ -33,9 +29,7 @@ if (build_with_chromium) { "//build/config/compiler:default_include_dirs", "../../build:openscreen_include_dirs", ] - public_deps = [ - "//third_party/googletest:gtest_main", - ] + public_deps = [ "//third_party/googletest:gtest_main" ] } } else { config("gmock_config") { @@ -68,7 +62,7 @@ if (build_with_chromium) { source_set("gmock") { testonly = true sources = [ - "src/googlemock/include/gmock.h", + "src/googlemock/include/gmock/gmock.h", "src/googlemock/src/gmock-all.cc", ] @@ -77,9 +71,7 @@ if (build_with_chromium) { ":gtest_config", ] - public_deps = [ - ":gtest", - ] + public_deps = [ ":gtest" ] include_dirs = [ "src/googlemock" ] } @@ -87,7 +79,7 @@ if (build_with_chromium) { source_set("gtest") { testonly = true sources = [ - "src/googletest/include/gtest.h", + "src/googletest/include/gtest/gtest.h", "src/googletest/src/gtest-all.cc", ] @@ -98,11 +90,7 @@ if (build_with_chromium) { source_set("gtest_main") { testonly = true - sources = [ - "src/googletest/src/gtest_main.cc", - ] - deps = [ - ":gtest", - ] + sources = [ "src/googletest/src/gtest_main.cc" ] + deps = [ ":gtest" ] } } |