diff options
| author | Mike Reed <reed@google.com> | 2018-09-19 19:55:49 +0000 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-09-19 19:55:58 +0000 |
| commit | 5d032ecb8f5978f5d1bef13f1120b97fc057d0e0 (patch) | |
| tree | 8639d6d22e64283373b82896b2114752f5e6da2c /gn | |
| parent | a5c578ff3d46ec7517107edcda16151677decb77 (diff) | |
| download | skqp-5d032ecb8f5978f5d1bef13f1120b97fc057d0e0.tar.gz | |
Revert "always optimize third_party code"
This reverts commit c766370d86cdf73b5edcc1e67c32316345ca89d7.
Reason for revert: speculative -- trying to fix Debian breaks (pdf?)
Original change's description:
> always optimize third_party code
>
> Change-Id: I5b2244460a4760e9336640f597d0f74c374a0d04
> Reviewed-on: https://skia-review.googlesource.com/155641
> Commit-Queue: Mike Klein <mtklein@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> Auto-Submit: Mike Klein <mtklein@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
TBR=mtklein@google.com,brianosman@google.com
Change-Id: I5467c95f9487c31e6f538f13579e490cdaeeee2e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/155607
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/BUILD.gn | 5 | ||||
| -rw-r--r-- | gn/BUILDCONFIG.gn | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 3d4c1104f4..34d3a91ed1 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -455,7 +455,7 @@ config("no_rtti") { } } -config("optimize") { +config("release") { if (is_win) { cflags = [ "/O2", @@ -484,9 +484,6 @@ config("optimize") { ldflags += [ "-O3" ] } } -} - -config("NDEBUG") { defines = [ "NDEBUG" ] } diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 9ab3637a41..e633c91a70 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -218,10 +218,7 @@ default_configs = [ "//gn:no_rtti", ] if (!is_debug) { - default_configs += [ - "//gn:optimize", - "//gn:NDEBUG", - ] + default_configs += [ "//gn:release" ] } if (!is_official_build) { default_configs += [ |