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

Unified Diff: third_party/brotli/BUILD.gn

Issue 2013493006: Revert of Brotli compression used on about credits html file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « components/resources/BUILD.gn ('k') | third_party/brotli/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/brotli/BUILD.gn
diff --git a/third_party/brotli/BUILD.gn b/third_party/brotli/BUILD.gn
index e08f23db275e105fb00b86b59c606d6d33e32993..5b13e6f3b7aba702f7794fc274f48d72dd52e63e 100644
--- a/third_party/brotli/BUILD.gn
+++ b/third_party/brotli/BUILD.gn
@@ -1,10 +1,6 @@
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-
-if (is_win) {
- import("//build/config/win/visual_studio_version.gni")
-}
source_set("brotli") {
sources = [
@@ -89,16 +85,15 @@
":brotli",
]
- if (is_win && visual_studio_version == "2015") {
- # Disabling "result of 32-bit shift implicitly converted to 64 bits",
- # caused by code like: foo |= (1 << i); // warning 4334
- cflags = [ "/wd4334" ]
- }
-
# Always build release since this is a build tool.
if (is_debug) {
configs -= [ "//build/config:debug" ]
configs += [ "//build/config:release" ]
}
+ if (is_posix) {
+ configs -= [ "//build/config/gcc:no_exceptions" ]
+ } else if (is_win) {
+ cflags_cc = [ "/EHsc" ]
+ }
}
}
« no previous file with comments | « components/resources/BUILD.gn ('k') | third_party/brotli/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698