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

Unified Diff: third_party/snappy/BUILD.gn

Issue 2712273002: DEPS: Upgrade snappy to 1.1.4. (Closed)
Patch Set: Buildbot fix, take 2. Created 3 years, 9 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 | « DEPS ('k') | third_party/snappy/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/snappy/BUILD.gn
diff --git a/third_party/snappy/BUILD.gn b/third_party/snappy/BUILD.gn
index 7eabb7b19e9bff0edc44f35c9edbb833b6ffffd6..606cc9521aa4dd35206d4ce80c4f5c367935ea24 100644
--- a/third_party/snappy/BUILD.gn
+++ b/third_party/snappy/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//testing/test.gni")
+
config("snappy_config") {
include_dirs = [ "src" ]
@@ -17,10 +19,16 @@ config("snappy_config") {
}
config("snappy_warnings") {
+ cflags = []
+
if (is_clang) {
# ComputeTable is unused,
# https://code.google.com/p/snappy/issues/detail?id=96
- cflags = [ "-Wno-unused-function" ]
+ cflags += [ "-Wno-unused-function" ]
+ }
+
+ if (is_win) {
+ cflags += [ "/wd4018" ] # Signed/unsigned mismatch in comparison.
}
}
@@ -44,9 +52,9 @@ static_library("snappy") {
]
public_configs = [ ":snappy_config" ]
- if (is_win) {
- cflags = [ "/wd4018" ] # Signed/unsigned mismatch in comparison.
- }
+ # Chromium doesn't use automake, but we generated config.h offline for all the
+ # platforms that we build for.
+ defines = [ "HAVE_CONFIG_H" ]
if (is_clang) {
# snappy-stubs-internal.h unapologetically has: using namespace std
« no previous file with comments | « DEPS ('k') | third_party/snappy/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698