Index: third_party/zlib/BUILD.gn |
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn |
index 0d592189c8b1811dd565f946fb1901ac6dbe548b..66e030515f078be9c89dda26189e90a79ca01225 100644 |
--- a/third_party/zlib/BUILD.gn |
+++ b/third_party/zlib/BUILD.gn |
@@ -28,6 +28,13 @@ static_library("zlib_x86_simd") { |
configs += [ "//build/config/compiler:no_chromium_code" ] |
} |
+config("zlib_warnings") { |
+ if (is_clang && !is_ios && |
+ (current_cpu == "x86" || current_cpu == "x64")) { |
+ cflags = [ "-Wno-incompatible-pointer-types" ] |
+ } |
+} |
+ |
static_library("zlib") { |
if (!is_win) { |
# Don't stomp on "libzlib" on other platforms. |
@@ -67,17 +74,13 @@ static_library("zlib") { |
if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) { |
sources += [ "x86.c" ] |
- |
- config("zlib_warnings") { |
- if (is_clang) { |
- cflags = [ "-Wno-incompatible-pointer-types" ] |
- } |
- } |
- configs += [ ":zlib_warnings" ] |
} |
configs -= [ "//build/config/compiler:chromium_code" ] |
- configs += [ "//build/config/compiler:no_chromium_code" ] |
+ configs += [ |
+ ":zlib_warnings", |
+ "//build/config/compiler:no_chromium_code", |
+ ] |
public_configs = [ ":zlib_config" ] |
deps = [ |
@@ -85,6 +88,14 @@ static_library("zlib") { |
] |
} |
+config("minizip_warnings") { |
+ visibility = [ ":*" ] |
+ if (is_clang) { |
+ # zlib uses `if ((a == b))` for some reason. |
+ cflags = [ "-Wno-parentheses-equality" ] |
+ } |
+} |
+ |
static_library("minizip") { |
sources = [ |
"contrib/minizip/ioapi.c", |
@@ -113,13 +124,6 @@ static_library("minizip") { |
":zlib", |
] |
- config("minizip_warnings") { |
- if (is_clang) { |
- # zlib uses `if ((a == b))` for some reason. |
- cflags = [ "-Wno-parentheses-equality" ] |
- } |
- } |
- |
configs -= [ "//build/config/compiler:chromium_code" ] |
configs += [ "//build/config/compiler:no_chromium_code" ] |
configs += [ ":minizip_warnings" ] |