Revert of Un-nest configs in GN files.

third_party/zlib/BUILD.gn

Index: third_party/zlib/BUILD.gn
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index 66e030515f078be9c89dda26189e90a79ca01225..0d592189c8b1811dd565f946fb1901ac6dbe548b 100644
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
@@ -26,13 +26,6 @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   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") {
@@ -74,26 +67,22 @@
 
   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 += [
-    ":zlib_warnings",
-    "//build/config/compiler:no_chromium_code",
-  ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
 
   public_configs = [ ":zlib_config" ]
   deps = [
     ":zlib_x86_simd",
   ]
-}
-
-config("minizip_warnings") {
-  visibility = [ ":*" ]
-  if (is_clang) {
-    # zlib uses `if ((a == b))` for some reason.
-    cflags = [ "-Wno-parentheses-equality" ]
-  }
 }
 
 static_library("minizip") {
@@ -124,6 +113,13 @@
     ":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" ]