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

Side by Side Diff: third_party/zlib/BUILD.gn

Issue 1214113010: Add local suppresion for -Wparentheses and enable everywhere on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moo Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « cloud_print/service/win/service.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 config("zlib_config") { 5 config("zlib_config") {
6 include_dirs = [ "." ] 6 include_dirs = [ "." ]
7 } 7 }
8 8
9 static_library("zlib_x86_simd") { 9 static_library("zlib_x86_simd") {
10 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) { 10 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 "contrib/minizip/iowin32.c", 95 "contrib/minizip/iowin32.c",
96 "contrib/minizip/iowin32.h", 96 "contrib/minizip/iowin32.h",
97 ] 97 ]
98 } 98 }
99 if (is_mac || is_ios || is_android) { 99 if (is_mac || is_ios || is_android) {
100 # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We 100 # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
101 # use fopen, ftell, and fseek instead on these systems. 101 # use fopen, ftell, and fseek instead on these systems.
102 defines = [ "USE_FILE32API" ] 102 defines = [ "USE_FILE32API" ]
103 } 103 }
104 104
105 if (is_clang) {
106 # zlib uses `if ((a == b))` for some reason.
107 cflags = [ "-Wno-parentheses-equality" ]
108 }
109
110 deps = [ 105 deps = [
111 ":zlib", 106 ":zlib",
112 ] 107 ]
113 108
109 config("minizip_warnings") {
110 if (is_clang) {
111 # zlib uses `if ((a == b))` for some reason.
112 cflags = [ "-Wno-parentheses-equality" ]
113 }
114 }
115
114 configs -= [ "//build/config/compiler:chromium_code" ] 116 configs -= [ "//build/config/compiler:chromium_code" ]
115 configs += [ "//build/config/compiler:no_chromium_code" ] 117 configs += [ "//build/config/compiler:no_chromium_code" ]
118 configs += [ ":minizip_warnings" ]
116 public_configs = [ ":zlib_config" ] 119 public_configs = [ ":zlib_config" ]
117 } 120 }
118 121
119 static_library("zip") { 122 static_library("zip") {
120 sources = [ 123 sources = [
121 "google/zip.cc", 124 "google/zip.cc",
122 "google/zip.h", 125 "google/zip.h",
123 "google/zip_internal.cc", 126 "google/zip_internal.cc",
124 "google/zip_internal.h", 127 "google/zip_internal.h",
125 "google/zip_reader.cc", 128 "google/zip_reader.cc",
126 "google/zip_reader.h", 129 "google/zip_reader.h",
127 ] 130 ]
128 deps = [ 131 deps = [
129 ":minizip", 132 ":minizip",
130 "//base", 133 "//base",
131 ] 134 ]
132 } 135 }
OLDNEW
« no previous file with comments | « cloud_print/service/win/service.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698