diff options
| author | Mike Klein <mtklein@google.com> | 2018-09-04 10:15:58 -0400 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-09-04 15:46:42 +0000 |
| commit | d84c1e65a67530bd595f7c4f4d6f1b7016b2fca2 (patch) | |
| tree | e4c1f1ff47bb97c22ee347b01d0a483977362b7a /gn | |
| parent | 434b80f82fee3c21ae330363354ae2669ed137f5 (diff) | |
| download | skqp-d84c1e65a67530bd595f7c4f4d6f1b7016b2fca2.tar.gz | |
drop warnings and -Werror from is_official_builds
People using is_official_build don't really want to see warnings.
They're for devs, not users.
The somewhat odd update to gn/BUILDCONFIG.gn keeps command
line flag precedence (later == more important) unchanged.
Change-Id: I1a04a35f066b7408021d474535f0dbf4928e21d3
Reviewed-on: https://skia-review.googlesource.com/151380
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/BUILD.gn | 2 | ||||
| -rw-r--r-- | gn/BUILDCONFIG.gn | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index d6fd5c2964..3dcdbed0b7 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -94,7 +94,6 @@ config("default") { cflags += [ "-fstrict-aliasing", "-fPIC", - "-Werror", ] cflags_cc += [ "-std=c++14" ] @@ -308,6 +307,7 @@ config("warnings") { ] } else { cflags += [ + "-Werror", "-Wall", "-Wextra", "-Winit-self", diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index e5440b9b76..e633c91a70 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -216,16 +216,20 @@ default_configs = [ "//gn:default", "//gn:no_exceptions", "//gn:no_rtti", - "//gn:warnings", - "//gn:warnings_except_public_headers", ] if (!is_debug) { default_configs += [ "//gn:release" ] } if (!is_official_build) { - default_configs += [ "//gn:debug_symbols" ] + default_configs += [ + "//gn:debug_symbols", + "//gn:warnings", + ] } -default_configs += [ "//gn:extra_flags" ] +default_configs += [ + "//gn:warnings_except_public_headers", + "//gn:extra_flags", +] set_defaults("executable") { configs = [ "//gn:executable" ] + default_configs |