diff --git a/DEPS b/DEPS
index 9167b6a5fb1..d2f186bd838 100644
--- a/DEPS
+++ b/DEPS
@@ -59,8 +59,8 @@ vars = {
   # The list of revisions for these tools comes from Fuchsia, here:
   # https://fuchsia.googlesource.com/integration/+/HEAD/prebuilts
   # If there are problems with the toolchain, contact fuchsia-toolchain@.
-  "clang_revision": "7e9747b50bcb1be28d4a3236571e8050835497a6",
-  "gn_revision": "1e3fd10c5df6b704fc764ee388149e4f32862823",
+  "clang_revision": "f2b4cc91e0830835c251e0525322effda8522b1c",
+  "gn_revision": "d7cf6238e07f87b51118f9823a1ec024c1f1932b",
 
   # Scripts that make 'git cl format' work.
   "clang_format_scripts_rev": "c09c8deeac31f05bd801995c475e7c8070f9ecda",
@@ -167,7 +167,7 @@ vars = {
   "web_socket_channel_rev": "680358915e331fda823908234f80beba1ed4ec83",
   "WebCore_rev": "fb11e887f77919450e497344da570d780e078bc8",
   "yaml_rev": "cca02c9e4f6826d62644901ed65c6d72b90a0713",
-  "zlib_rev": "c44fb7248079cc3d5563b14b3f758aee60d6b415",
+  "zlib_rev": "bf44340d1b6be1af8950bbdf664fec0cf5a831cc",
   "crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed",
   "minichromium_rev": "8d641e30a8b12088649606b912c2bc4947419ccc",
   "googletest_rev": "f854f1d27488996dc8a6db3c9453f80b02585e12",
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
new file mode 100644
index 00000000000..fd178e1c68b
--- /dev/null
+++ b/build/config/compiler/compiler.gni
@@ -0,0 +1,13 @@
+# Copyright 2016 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is a bare-minimum needed to satisfy build requirements for various
+# chromium packages.
+# Original is https://chromium.googlesource.com/chromium/src/+/master/build/config/compiler/compiler.gni
+
+declare_args() {
+  build_with_chromium = false
+  use_libfuzzer = false
+  is_apple = is_ios || is_mac
+}