Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5292)

Unified Diff: build/secondary/testing/gtest/BUILD.gn

Issue 1318823008: Un-nest configs in GN files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sdch/BUILD.gn » ('j') | third_party/harfbuzz-ng/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/testing/gtest/BUILD.gn
diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn
index a9f5007b2670a8619048c58e451396c26cc8f69f..e5de2e073838fe580ee2d9dbae0a2de140658bc0 100644
--- a/build/secondary/testing/gtest/BUILD.gn
+++ b/build/secondary/testing/gtest/BUILD.gn
@@ -58,6 +58,15 @@ config("gtest_direct_config") {
defines = [ "UNIT_TEST" ]
}
+config("gtest_warnings") {
+ if (is_win && is_clang) {
+ # The Mutex constructor initializer list in gtest-port.cc is incorrectly
+ # ordered. See
+ # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6sJ.
+ cflags = [ "-Wno-reorder" ]
+ }
+}
+
static_library("gtest") {
# TODO http://crbug.com/412064 enable this flag all the time.
testonly = !is_component_build
@@ -123,14 +132,6 @@ static_library("gtest") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
- config("gtest_warnings") {
- if (is_win && is_clang) {
- # The Mutex constructor initializer list in gtest-port.cc is incorrectly
- # ordered. See
- # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6sJ.
- cflags = [ "-Wno-reorder" ]
- }
- }
configs += [ ":gtest_warnings" ]
}
« no previous file with comments | « no previous file | sdch/BUILD.gn » ('j') | third_party/harfbuzz-ng/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698