diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/testing/gmock | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
| download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/testing/gmock')
| -rw-r--r-- | chromium/testing/gmock/BUILD.gn | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chromium/testing/gmock/BUILD.gn b/chromium/testing/gmock/BUILD.gn index 11d7901755b..1492a158e9b 100644 --- a/chromium/testing/gmock/BUILD.gn +++ b/chromium/testing/gmock/BUILD.gn @@ -5,6 +5,9 @@ # The file/directory layout of Google Test is not yet considered stable. Until # it stabilizes, Chromium code MUST use this target instead of reaching directly # into //third_party/googletest. + +import("//build_overrides/build.gni") + source_set("gmock") { testonly = true sources = [ @@ -17,6 +20,17 @@ source_set("gmock") { "//third_party/googletest:gmock", ] + # TODO(crbug.com/806952): Depending on gmock_mutant only if build_with_chromium, + # because gmock_mutant depends on //base which uses C++14. Since gmock is a + # third_party library used by other projects it should not include C++14 only code. + if (build_with_chromium) { + # Allow Chromium targets depending on gmock to #include testing/gmock_mutant.h + # without triggering a `gn check` error. + public_deps = [ + "//testing:gmock_mutant", + ] + } + public_configs = [ "//third_party/googletest:gmock_config", "//third_party/googletest:gtest_config", |