Extract use_system_foo logic out of gyp files, patch 2

This removes use_system_foo logic completely from:
 * jsoncpp.gyp
 * libevent.gyp
 * libpng.gyp
 * libusb.gyp
 * libwebp.gyp
 * opus.gyp
 * re2.gyp
 * zlib.gyp

R=rsleevi
TBR=darin

BUG=226860

Review URL: https://codereview.chromium.org/14203006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196551 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 1218 insertions, 1078 deletions

diff --git a/build/linux/unbundle/bzip2.gyp b/build/linux/unbundle/bzip2.gyp
new file mode 100644
index 0000000..ddcf509
--- /dev/null
+++ b/build/linux/unbundle/bzip2.gyp
@@ -0,0 +1,22 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'bzip2',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'defines': [
+          'USE_SYSTEM_LIBBZ2',
+        ],
+      },
+      'link_settings': {
+        'libraries': [
+          '-lbz2',
+        ],
+      },
+    },
+  ],
+}
diff --git a/build/linux/unbundle/expat.gyp b/build/linux/unbundle/expat.gyp
new file mode 100644
index 0000000..030fb85
--- /dev/null
+++ b/build/linux/unbundle/expat.gyp
@@ -0,0 +1,17 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'expat',
+      'type': 'none',
+      'link_settings': {
+        'libraries': [
+          '-lexpat',
+        ],
+      },
+    },
+  ],
+}
diff --git a/build/linux/unbundle/jsoncpp.gyp b/build/linux/unbundle/jsoncpp.gyp
new file mode 100644
index 0000000..c397f64
--- /dev/null
+++ b/build/linux/unbundle/jsoncpp.gyp
@@ -0,0 +1,39 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'jsoncpp',
+      'type': 'none',
+      'variables': {
+        'headers_root_path': 'source/include',
+        'header_filenames': [
+          'json/assertions.h',
+          'json/autolink.h',
+          'json/config.h',
+          'json/features.h',
+          'json/forwards.h',
+          'json/json.h',
+          'json/reader.h',
+          'json/value.h',
+          'json/writer.h',
+        ],
+      },
+      'includes': [
+        '../../build/shim_headers.gypi',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '/usr/include/jsoncpp',
+        ],
+      },
+      'link_settings': {
+        'libraries': [
+          '-ljsoncpp',
+        ],
+      },
+    }
+  ],
+}
diff --git a/build/linux/unbundle/libevent.gyp b/build/linux/unbundle/libevent.gyp
new file mode 100644
index 0000000..99d7435
--- /dev/null
+++ b/build/linux/unbundle/libevent.gyp
@@ -0,0 +1,27 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'libevent',
+      'type': 'none',
+      'toolsets': ['host', 'target'],
+      'variables': {
+        'headers_root_path': '.',
+        'header_filenames': [
+          'event.h',
+        ],
+      },
+      'includes': [
+        '../../build/shim_headers.gypi',
+      ],
+      'link_settings': {
+        'libraries': [
+          '-levent',
+        ],
+      },
+    }
+  ],
+}
diff --git a/build/linux/unbundle/libjpeg.gyp b/build/linux/unbundle/libjpeg.gyp
new file mode 100644
index 0000000..f56e7aa
--- /dev/null
+++ b/build/linux/unbundle/libjpeg.gyp
@@ -0,0 +1,29 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'libjpeg',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'defines': [
+          'USE_SYSTEM_LIBJPEG',
+        ],
+        'conditions': [
+          ['os_bsd==1', {
+            'include_dirs': [
+              '/usr/local/include',
+            ],
+          }],
+        ],
+      },
+      'link_settings': {
+        'libraries': [
+          '-ljpeg',
+        ],
+      },
+    }
+  ],
+}
diff --git a/build/linux/unbundle/libpng.gyp b/build/linux/unbundle/libpng.gyp
new file mode 100644
index 0000000..d6933fc
--- /dev/null
+++ b/build/linux/unbundle/libpng.gyp
@@ -0,0 +1,38 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'libpng',
+      'type': 'none',
+      'dependencies': [
+        '../zlib/zlib.gyp:zlib',
+      ],
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags libpng)',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other libpng)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l libpng)',
+        ],
+      },
+      'variables': {
+        'headers_root_path': '.',
+        'header_filenames': [
+          'png.h',
+          'pngconf.h',
+        ],
+      },
+      'includes': [
+        '../../build/shim_headers.gypi',
+      ],
+    },
+  ],
+}
diff --git a/build/linux/unbundle/libusb.gyp b/build/linux/unbundle/libusb.gyp
new file mode 100644
index 0000000..1c18033
--- /dev/null
+++ b/build/linux/unbundle/libusb.gyp
@@ -0,0 +1,34 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'libusb',
+      'type': 'none',
+      'variables': {
+        'headers_root_path': 'src/libusb',
+        'header_filenames': [
+          'libusb.h',
+        ],
+      },
+      'includes': [
+        '../../build/shim_headers.gypi',
+      ],
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags libusb-1.0)',
+        ],
+        'link_settings': {
+          'ldflags': [
+            '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
+          ],
+          'libraries': [
+            '<!@(pkg-config --libs-only-l libusb-1.0)',
+          ],
+        },
+      },
+    },
+  ],
+}
diff --git a/build/linux/unbundle/libwebp.gyp b/build/linux/unbundle/libwebp.gyp
new file mode 100644
index 0000000..6dbce2e
--- /dev/null
+++ b/build/linux/unbundle/libwebp.gyp
@@ -0,0 +1,28 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'libwebp',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'defines': [
+          'ENABLE_WEBP',
+        ],
+      },
+      'link_settings': {
+        'libraries': [
+          # Check for presence of webpdemux library, use it if present.
+          '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+          '--code "int main() { return 0; }" '
+          '--run-linker '
+          '--on-success "-lwebp -lwebpdemux" '
+          '--on-failure "-lwebp" '
+          '-- -lwebpdemux)',
+        ],
+      },
+    }
+  ],
+}
diff --git a/build/linux/unbundle/libxml.gyp b/build/linux/unbundle/libxml.gyp
new file mode 100644
index 0000000..bc4f9fc
--- /dev/null
+++ b/build/linux/unbundle/libxml.gyp
@@ -0,0 +1,38 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'libxml',
+      'type': 'static_library',
+      'sources': [
+        'chromium/libxml_utils.h',
+        'chromium/libxml_utils.cc',
+      ],
+      'cflags': [
+        '<!@(pkg-config --cflags libxml-2.0)',
+      ],
+      'defines': [
+        'USE_SYSTEM_LIBXML',
+      ],
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags libxml-2.0)',
+        ],
+        'defines': [
+          'USE_SYSTEM_LIBXML',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l libxml-2.0)',
+        ],
+      },
+    },
+  ],
+}
diff --git a/build/linux/unbundle/libxslt.gyp b/build/linux/unbundle/libxslt.gyp
new file mode 100644
index 0000000..f7f6bb9
--- /dev/null
+++ b/build/linux/unbundle/libxslt.gyp
@@ -0,0 +1,25 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'libxslt',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags libxslt)',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other libxslt)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l libxslt)',
+        ],
+      },
+    },
+  ],
+}
diff --git a/build/linux/unbundle/opus.gyp b/build/linux/unbundle/opus.gyp
new file mode 100644
index 0000000..e8c30ba
--- /dev/null
+++ b/build/linux/unbundle/opus.gyp
@@ -0,0 +1,38 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'opus',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags opus)',
+        ],
+      },
+      'variables': {
+        'headers_root_path': 'src/include',
+        'header_filenames': [
+          'opus_custom.h',
+          'opus_defines.h',
+          'opus_multistream.h',
+          'opus_types.h',
+          'opus.h',
+        ],
+      },
+      'includes': [
+        '../../build/shim_headers.gypi',
+      ],
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other opus)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l opus)',
+        ],
+      },
+    },
+  ],
+}
diff --git a/build/linux/unbundle/re2.gyp b/build/linux/unbundle/re2.gyp
new file mode 100644
index 0000000..e2e567a
--- /dev/null
+++ b/build/linux/unbundle/re2.gyp
@@ -0,0 +1,37 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 're2',
+      'type': 'none',
+      'variables': {
+        'headers_root_path': '.',
+        'header_filenames': [
+          're2/filtered_re2.h',
+          're2/re2.h',
+          're2/set.h',
+          're2/stringpiece.h',
+          're2/variadic_function.h',
+        ],
+        'shim_generator_additional_args': [
+          # Chromium copy of re2 is patched to rename POSIX to POSIX_SYNTAX
+          # because of collision issues that break the build.
+          # Upstream refuses to make changes:
+          # http://code.google.com/p/re2/issues/detail?id=73 .
+          '--define', 'POSIX=POSIX_SYNTAX',
+        ],
+      },
+      'includes': [
+        '../../build/shim_headers.gypi',
+      ],
+      'link_settings': {
+        'libraries': [
+          '-lre2',
+        ],
+      },
+    }
+  ],
+}
diff --git a/build/linux/unbundle/replace_gyp_files.py b/build/linux/unbundle/replace_gyp_files.py
index bf29458..0a5f9fe 100755
--- a/build/linux/unbundle/replace_gyp_files.py
+++ b/build/linux/unbundle/replace_gyp_files.py
@@ -15,7 +15,21 @@ import sys
 
 
 REPLACEMENTS = {
+  'use_system_bzip2': 'third_party/bzip2/bzip2.gyp',
+  'use_system_expat': 'third_party/expat/expat.gyp',
   'use_system_harfbuzz': 'third_party/harfbuzz-ng/harfbuzz.gyp',
+  'use_system_jsoncpp': 'third_party/jsoncpp/jsoncpp.gyp',
+  'use_system_libevent': 'third_party/libevent/libevent.gyp',
+  'use_system_libjpeg': 'third_party/libjpeg/libjpeg.gyp',
+  'use_system_libpng': 'third_party/libpng/libpng.gyp',
+  'use_system_libusb': 'third_party/libusb/libusb.gyp',
+  'use_system_libwebp': 'third_party/libwebp/libwebp.gyp',
+  'use_system_libxml': 'third_party/libxml/libxml.gyp',
+  'use_system_libxslt': 'third_party/libxslt/libxslt.gyp',
+  'use_system_opus': 'third_party/opus/opus.gyp',
+  'use_system_re2': 'third_party/re2/re2.gyp',
+  'use_system_sqlite': 'third_party/sqlite/sqlite.gyp',
+  'use_system_zlib': 'third_party/zlib/zlib.gyp',
 }
 
 
diff --git a/build/linux/unbundle/sqlite.gyp b/build/linux/unbundle/sqlite.gyp
new file mode 100644
index 0000000..918da92
--- /dev/null
+++ b/build/linux/unbundle/sqlite.gyp
@@ -0,0 +1,28 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'sqlite',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(pkg-config --cflags sqlite3)',
+        ],
+        'defines': [
+          'USE_SYSTEM_SQLITE',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l sqlite3)',
+        ],
+      },
+    },
+  ],
+}
diff --git a/build/linux/unbundle/zlib.gyp b/build/linux/unbundle/zlib.gyp
new file mode 100644
index 0000000..3992e2d
--- /dev/null
+++ b/build/linux/unbundle/zlib.gyp
@@ -0,0 +1,48 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'zlib',
+      'type': 'none',
+      'variables': {
+        'headers_root_path': '.',
+        'header_filenames': [
+          'zlib.h',
+        ],
+      },
+      'includes': [
+        '../../build/shim_headers.gypi',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          'USE_SYSTEM_ZLIB',
+        ],
+      },
+      'link_settings': {
+        'libraries': [
+          '-lz',
+        ],
+      },
+    },
+    {
+      'target_name': 'minizip',
+      'type': 'static_library',
+      'all_dependent_settings': {
+        'defines': [
+          'USE_SYSTEM_MINIZIP',
+        ],
+      },
+      'defines': [
+        'USE_SYSTEM_MINIZIP',
+      ],
+      'link_settings': {
+        'libraries': [
+          '-lminizip',
+        ],
+      },
+    }
+  ],
+}
diff --git a/third_party/jsoncpp/jsoncpp.gyp b/third_party/jsoncpp/jsoncpp.gyp
index b712571..1395f94 100644
--- a/third_party/jsoncpp/jsoncpp.gyp
+++ b/third_party/jsoncpp/jsoncpp.gyp
@@ -3,82 +3,41 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'use_system_jsoncpp%': 0,
-  },
-  'conditions': [
-    ['use_system_jsoncpp==0', {
-      'targets': [
-        {
-          'target_name': 'jsoncpp',
-          'type': 'static_library',
-          'defines': [
-            'JSON_USE_EXCEPTION=0',
-          ],
-          'sources': [
-            'source/include/json/assertions.h',
-            'source/include/json/autolink.h',
-            'source/include/json/config.h',
-            'source/include/json/features.h',
-            'source/include/json/forwards.h',
-            'source/include/json/json.h',
-            'source/include/json/reader.h',
-            'overrides/include/json/value.h',
-            'source/include/json/writer.h',
-            'source/src/lib_json/json_batchallocator.h',
-            'source/src/lib_json/json_reader.cpp',
-            'source/src/lib_json/json_tool.h',
-            'overrides/src/lib_json/json_value.cpp',
-            'source/src/lib_json/json_writer.cpp',
-          ],
-          'include_dirs': [
-            'overrides/include/',
-            'source/include/',
-            'source/src/lib_json/',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              'overrides/include/',
-              'source/include/',
-            ],
-          },
-        },
+  'targets': [
+    {
+      'target_name': 'jsoncpp',
+      'type': 'static_library',
+      'defines': [
+        'JSON_USE_EXCEPTION=0',
       ],
-    }, { # use_system_jsoncpp==1
-      'targets': [
-        {
-          'target_name': 'jsoncpp',
-          'type': 'none',
-          'variables': {
-            'headers_root_path': 'source/include',
-            'header_filenames': [
-              'json/assertions.h',
-              'json/autolink.h',
-              'json/config.h',
-              'json/features.h',
-              'json/forwards.h',
-              'json/json.h',
-              'json/reader.h',
-              'json/value.h',
-              'json/writer.h',
-            ],
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '/usr/include/jsoncpp',
-            ],
-          },
-          'link_settings': {
-            'libraries': [
-              '-ljsoncpp',
-            ],
-          },
-        }
+      'sources': [
+        'source/include/json/assertions.h',
+        'source/include/json/autolink.h',
+        'source/include/json/config.h',
+        'source/include/json/features.h',
+        'source/include/json/forwards.h',
+        'source/include/json/json.h',
+        'source/include/json/reader.h',
+        'overrides/include/json/value.h',
+        'source/include/json/writer.h',
+        'source/src/lib_json/json_batchallocator.h',
+        'source/src/lib_json/json_reader.cpp',
+        'source/src/lib_json/json_tool.h',
+        'overrides/src/lib_json/json_value.cpp',
+        'source/src/lib_json/json_writer.cpp',
       ],
-    }],
+      'include_dirs': [
+        'overrides/include/',
+        'source/include/',
+        'source/src/lib_json/',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'overrides/include/',
+          'source/include/',
+        ],
+      },
+    },
   ],
 }
 
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index e0d8304..27ac1f9 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -3,90 +3,61 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'use_system_libevent%': 0,
-  },
-  'conditions': [
-    ['use_system_libevent==0', {
-      'targets': [
-        {
-          'target_name': 'libevent',
-          'product_name': 'event',
-          'type': 'static_library',
-          'toolsets': ['host', 'target'],
-          'sources': [
-            'buffer.c',
-            'evbuffer.c',
-            'evdns.c',
-            'event.c',
-            'event_tagging.c',
-            'evrpc.c',
-            'evutil.c',
-            'http.c',
-            'log.c',
-            'poll.c',
-            'select.c',
-            'signal.c',
-            'strlcpy.c',
-          ],
-          'defines': [
-            'HAVE_CONFIG_H',
-          ],
-          'conditions': [
-            # libevent has platform-specific implementation files.  Since its
-            # native build uses autoconf, platform-specific config.h files are
-            # provided and live in platform-specific directories.
-            [ 'OS == "linux" or (OS == "android" and _toolset == "host")', {
-              'sources': [ 'epoll.c', 'epoll_sub.c' ],
-              'include_dirs': [ 'linux' ],
-              'link_settings': {
-                'libraries': [
-                  # We need rt for clock_gettime().
-                  # TODO(port) Maybe on FreeBSD as well?
-                  '-lrt',
-                ],
-              },
-            }],
-            [ 'OS == "android" and _toolset == "target"', {
-              # On android, epoll_create(), epoll_ctl(), epoll_wait() and
-              # clock_gettime() are all in libc.so, so no need to add
-              # epoll_sub.c and link librt.
-              'sources': [ 'epoll.c' ],
-              'include_dirs': [ 'android' ],
-            }],
-            [ 'OS == "mac" or OS == "ios" or os_bsd==1', {
-              'sources': [ 'kqueue.c' ],
-              'include_dirs': [ 'mac' ]
-            }],
-            [ 'OS == "solaris"', {
-              'sources': [ 'devpoll.c', 'evport.c' ],
-              'include_dirs': [ 'solaris' ]
-            }],
-          ],
-        },
+  'targets': [
+    {
+      'target_name': 'libevent',
+      'product_name': 'event',
+      'type': 'static_library',
+      'toolsets': ['host', 'target'],
+      'sources': [
+        'buffer.c',
+        'evbuffer.c',
+        'evdns.c',
+        'event.c',
+        'event_tagging.c',
+        'evrpc.c',
+        'evutil.c',
+        'http.c',
+        'log.c',
+        'poll.c',
+        'select.c',
+        'signal.c',
+        'strlcpy.c',
       ],
-    }, {  # use_system_libevent != 0
-      'targets': [
-        {
-          'target_name': 'libevent',
-          'type': 'none',
-          'toolsets': ['host', 'target'],
-          'variables': {
-            'headers_root_path': '.',
-            'header_filenames': [
-              'event.h',
-            ],
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
-          ],
+      'defines': [
+        'HAVE_CONFIG_H',
+      ],
+      'conditions': [
+        # libevent has platform-specific implementation files.  Since its
+        # native build uses autoconf, platform-specific config.h files are
+        # provided and live in platform-specific directories.
+        [ 'OS == "linux" or (OS == "android" and _toolset == "host")', {
+          'sources': [ 'epoll.c', 'epoll_sub.c' ],
+          'include_dirs': [ 'linux' ],
           'link_settings': {
             'libraries': [
-              '-levent',
+              # We need rt for clock_gettime().
+              # TODO(port) Maybe on FreeBSD as well?
+              '-lrt',
             ],
           },
-        }
+        }],
+        [ 'OS == "android" and _toolset == "target"', {
+          # On android, epoll_create(), epoll_ctl(), epoll_wait() and
+          # clock_gettime() are all in libc.so, so no need to add
+          # epoll_sub.c and link librt.
+          'sources': [ 'epoll.c' ],
+          'include_dirs': [ 'android' ],
+        }],
+        [ 'OS == "mac" or OS == "ios" or os_bsd==1', {
+          'sources': [ 'kqueue.c' ],
+          'include_dirs': [ 'mac' ]
+        }],
+        [ 'OS == "solaris"', {
+          'sources': [ 'devpoll.c', 'evport.c' ],
+          'include_dirs': [ 'solaris' ]
+        }],
       ],
-    }],
+    },
   ],
 }
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index 789778b..38082f4 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -3,135 +3,76 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'conditions': [
-      [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
-        # Maybe link to system .so once the security concerns are thought
-        # through, since we already use it due to GTK.
-        'use_system_libpng%': 0,
-      }, {  # os_posix != 1 or OS == "mac"
-        'use_system_libpng%': 0,
-      }],
-    ],
-  },
-  'conditions': [
-    ['use_system_libpng==0', {
-      'targets': [
-        {
-          'target_name': 'libpng',
-          'dependencies': [
-            '../zlib/zlib.gyp:zlib',
-          ],
-          'defines': [
-            'CHROME_PNG_WRITE_SUPPORT',
-            'PNG_USER_CONFIG',
-          ],
-          'sources': [
-            'png.c',
-            'png.h',
-            'pngconf.h',
-            'pngerror.c',
-            'pnggccrd.c',
-            'pngget.c',
-            'pngmem.c',
-            'pngpread.c',
-            'pngread.c',
-            'pngrio.c',
-            'pngrtran.c',
-            'pngrutil.c',
-            'pngset.c',
-            'pngtrans.c',
-            'pngusr.h',
-            'pngvcrd.c',
-            'pngwio.c',
-            'pngwrite.c',
-            'pngwtran.c',
-            'pngwutil.c',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '.',
-            ],
-            'defines': [
-              'CHROME_PNG_WRITE_SUPPORT',
-              'PNG_USER_CONFIG',
-            ],
-          },
-          'export_dependent_settings': [
-            '../zlib/zlib.gyp:zlib',
-          ],
-          # TODO(jschuh): http://crbug.com/167187
-          'msvs_disabled_warnings': [ 4267 ],
-          'conditions': [
-            ['OS!="win"', {'product_name': 'png'}],
-            ['OS=="win"', {
-              'type': '<(component)',
-            }, {
-              # Chromium libpng does not support building as a shared_library
-              # on non-Windows platforms.
-              'type': 'static_library',
-            }],
-            ['OS=="win" and component=="shared_library"', {
-              'defines': [
-                'PNG_BUILD_DLL',
-                'PNG_NO_MODULEDEF',
-              ],
-              'direct_dependent_settings': {
-                'defines': [
-                  'PNG_USE_DLL',
-                ],
-              },          
-            }],
-            ['OS=="android"', {
-              'toolsets': ['target', 'host'],
-            }],
-          ],
-        },
-      ]
-    }, {
+  'targets': [
+    {
+      'target_name': 'libpng',
+      'dependencies': [
+        '../zlib/zlib.gyp:zlib',
+      ],
+      'defines': [
+        'CHROME_PNG_WRITE_SUPPORT',
+        'PNG_USER_CONFIG',
+      ],
+      'sources': [
+        'png.c',
+        'png.h',
+        'pngconf.h',
+        'pngerror.c',
+        'pnggccrd.c',
+        'pngget.c',
+        'pngmem.c',
+        'pngpread.c',
+        'pngread.c',
+        'pngrio.c',
+        'pngrtran.c',
+        'pngrutil.c',
+        'pngset.c',
+        'pngtrans.c',
+        'pngusr.h',
+        'pngvcrd.c',
+        'pngwio.c',
+        'pngwrite.c',
+        'pngwtran.c',
+        'pngwutil.c',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '.',
+        ],
+        'defines': [
+          'CHROME_PNG_WRITE_SUPPORT',
+          'PNG_USER_CONFIG',
+        ],
+      },
+      'export_dependent_settings': [
+        '../zlib/zlib.gyp:zlib',
+      ],
+      # TODO(jschuh): http://crbug.com/167187
+      'msvs_disabled_warnings': [ 4267 ],
       'conditions': [
-        ['sysroot!=""', {
-          'variables': {
-            'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
-          },
+        ['OS!="win"', {'product_name': 'png'}],
+        ['OS=="win"', {
+          'type': '<(component)',
         }, {
-          'variables': {
-            'pkg-config': 'pkg-config'
-          },
+          # Chromium libpng does not support building as a shared_library
+          # on non-Windows platforms.
+          'type': 'static_library',
         }],
-      ],
-      'targets': [
-        {
-          'target_name': 'libpng',
-          'type': 'none',
-          'dependencies': [
-            '../zlib/zlib.gyp:zlib',
+        ['OS=="win" and component=="shared_library"', {
+          'defines': [
+            'PNG_BUILD_DLL',
+            'PNG_NO_MODULEDEF',
           ],
           'direct_dependent_settings': {
-            'cflags': [
-              '<!@(<(pkg-config) --cflags libpng)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other libpng)',
-            ],
-            'libraries': [
-              '<!@(<(pkg-config) --libs-only-l libpng)',
-            ],
-          },
-          'variables': {
-            'headers_root_path': '.',
-            'header_filenames': [
-              'png.h',
-              'pngconf.h',
+            'defines': [
+              'PNG_USE_DLL',
             ],
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
-          ],
-        },
+          },          
+        }],
+        ['OS=="android"', {
+          'toolsets': ['target', 'host'],
+        }],
       ],
-    }],
-  ],
+    },
+  ]
 }
diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp
index 1e29d25..196054e 100644
--- a/third_party/libusb/libusb.gyp
+++ b/third_party/libusb/libusb.gyp
@@ -3,99 +3,68 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'use_system_libusb%': 0,
-  },
   'targets': [
     {
       'target_name': 'libusb',
+      'type': 'static_library',
+      'sources': [
+        'src/libusb/core.c',
+        'src/libusb/descriptor.c',
+        'src/libusb/io.c',
+        'src/libusb/sync.c',
+      ],
+      'include_dirs': [
+        'src',
+        'src/libusb',
+        'src/libusb/os',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'src/libusb',
+        ],
+      },
       'conditions': [
-        ['OS == "linux" and use_system_libusb==1', {
-          'type': 'none',
-          'variables': {
-            'headers_root_path': 'src/libusb',
-            'header_filenames': [
-              'libusb.h',
-            ],
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
+        [ 'OS == "linux" or OS == "android"', {
+          'sources': [
+            'src/libusb/os/linux_usbfs.c',
+            'src/libusb/os/threads_posix.c',
           ],
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(pkg-config --cflags libusb-1.0)',
-            ],
-            'link_settings': {
-              'ldflags': [
-                '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
-              ],
-              'libraries': [
-                '<!@(pkg-config --libs-only-l libusb-1.0)',
-              ],
-            },
-          },
-        }, {
-          'type': 'static_library',
+          'defines': [
+            'DEFAULT_VISIBILITY=',
+            'HAVE_POLL_H=1',
+            'HAVE_SYS_TIME_H=1',
+            'OS_LINUX=1',
+            'POLL_NFDS_TYPE=nfds_t',
+            'THREADS_POSIX=1',
+            '_GNU_SOURCE=1',
+          ],
+        }],
+        ['OS == "win"', {
           'sources': [
-            'src/libusb/core.c',
-            'src/libusb/descriptor.c',
-            'src/libusb/io.c',
-            'src/libusb/sync.c',
+            'src/libusb/os/poll_windows.c',
+            'src/libusb/os/threads_windows.c',
+            'src/libusb/os/windows_usb.c',
           ],
-          'include_dirs': [
+          'include_dirs!': [
             'src',
-            'src/libusb',
-            'src/libusb/os',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              'src/libusb',
-            ],
-          },
-          'conditions': [
-            [ 'OS == "linux" or OS == "android"', {
-              'sources': [
-                'src/libusb/os/linux_usbfs.c',
-                'src/libusb/os/threads_posix.c',
-              ],
-              'defines': [
-                'DEFAULT_VISIBILITY=',
-                'HAVE_POLL_H=1',
-                'HAVE_SYS_TIME_H=1',
-                'OS_LINUX=1',
-                'POLL_NFDS_TYPE=nfds_t',
-                'THREADS_POSIX=1',
-                '_GNU_SOURCE=1',
-              ],
-            }],
-            ['OS == "win"', {
-              'sources': [
-                'src/libusb/os/poll_windows.c',
-                'src/libusb/os/threads_windows.c',
-                'src/libusb/os/windows_usb.c',
-              ],
-              'include_dirs!': [
-                'src',
-              ],
-              'include_dirs': [
-                'src/msvc',
-              ],
-            }],
-            ['OS == "mac"', {
-              'sources': [
-                'src/libusb/os/darwin_usb.c',
-                'src/libusb/os/threads_posix.c',
-              ],
-              'defines': [
-                'DEFAULT_VISIBILITY=',
-                'HAVE_POLL_H=1',
-                'HAVE_SYS_TIME_H=1',
-                'OS_DARWIN=1',
-                'POLL_NFDS_TYPE=nfds_t',
-                'THREADS_POSIX=1',
-                '_GNU_SOURCE=1',
-              ],
-            }],
+          'include_dirs': [
+            'src/msvc',
+          ],
+        }],
+        ['OS == "mac"', {
+          'sources': [
+            'src/libusb/os/darwin_usb.c',
+            'src/libusb/os/threads_posix.c',
+          ],
+          'defines': [
+            'DEFAULT_VISIBILITY=',
+            'HAVE_POLL_H=1',
+            'HAVE_SYS_TIME_H=1',
+            'OS_DARWIN=1',
+            'POLL_NFDS_TYPE=nfds_t',
+            'THREADS_POSIX=1',
+            '_GNU_SOURCE=1',
           ],
         }],
       ],
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
index 10a6615..4fb6175 100644
--- a/third_party/libwebp/libwebp.gyp
+++ b/third_party/libwebp/libwebp.gyp
@@ -3,176 +3,146 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'use_system_libwebp%': 0,
-  },
-  'conditions': [
-    ['use_system_libwebp==0', {
-      'targets': [
-        {
-          'target_name': 'libwebp_dec',
-          'type': 'static_library',
-          'include_dirs': ['.'],
-          'sources': [
-            'dec/alpha.c',
-            'dec/buffer.c',
-            'dec/frame.c',
-            'dec/idec.c',
-            'dec/io.c',
-            'dec/layer.c',
-            'dec/quant.c',
-            'dec/tree.c',
-            'dec/vp8.c',
-            'dec/vp8l.c',
-            'dec/webp.c',
-          ],
-        },
-        {
-          'target_name': 'libwebp_demux',
-          'type': 'static_library',
-          'include_dirs': ['.'],
-          'sources': [
-            'demux/demux.c',
-          ],
-        },
-        {
-          'target_name': 'libwebp_dsp',
-          'type': 'static_library',
-          'include_dirs': ['.'],
-          'sources': [
-            'dsp/cpu.c',
-            'dsp/dec.c',
-            'dsp/dec_sse2.c',
-            'dsp/enc.c',
-            'dsp/enc_sse2.c',
-            'dsp/lossless.c',
-            'dsp/upsampling.c',
-            'dsp/upsampling_sse2.c',
-            'dsp/yuv.c',
-          ],
-          'conditions': [
-            ['OS == "android"', {
-              'includes': [ '../../build/android/cpufeatures.gypi' ],
-            }],
-            ['order_profiling != 0', {
-              'target_conditions' : [
-                ['_toolset=="target"', {
-                  'cflags!': [ '-finstrument-functions' ],
-                }],
-              ],
-            }],
-          ],
-        },
-        {
-          'target_name': 'libwebp_dsp_neon',
-          'conditions': [
-            ['armv7 == 1', {
-              'type': 'static_library',
-              'include_dirs': ['.'],
-              'sources': [
-                'dsp/dec_neon.c',
-                'dsp/enc_neon.c',
-                'dsp/upsampling_neon.c',
-              ],
-              # behavior similar to *.c.neon in an Android.mk
-              'cflags!': [ '-mfpu=vfpv3-d16' ],
-              'cflags': [ '-mfpu=neon' ],
-            },{  # "armv7 != 1"
-              'type': 'none',
-            }],
-            ['order_profiling != 0', {
-              'target_conditions' : [
-                ['_toolset=="target"', {
-                  'cflags!': [ '-finstrument-functions' ],
-                }],
-              ],
+  'targets': [
+    {
+      'target_name': 'libwebp_dec',
+      'type': 'static_library',
+      'include_dirs': ['.'],
+      'sources': [
+        'dec/alpha.c',
+        'dec/buffer.c',
+        'dec/frame.c',
+        'dec/idec.c',
+        'dec/io.c',
+        'dec/layer.c',
+        'dec/quant.c',
+        'dec/tree.c',
+        'dec/vp8.c',
+        'dec/vp8l.c',
+        'dec/webp.c',
+      ],
+    },
+    {
+      'target_name': 'libwebp_demux',
+      'type': 'static_library',
+      'include_dirs': ['.'],
+      'sources': [
+        'demux/demux.c',
+      ],
+    },
+    {
+      'target_name': 'libwebp_dsp',
+      'type': 'static_library',
+      'include_dirs': ['.'],
+      'sources': [
+        'dsp/cpu.c',
+        'dsp/dec.c',
+        'dsp/dec_sse2.c',
+        'dsp/enc.c',
+        'dsp/enc_sse2.c',
+        'dsp/lossless.c',
+        'dsp/upsampling.c',
+        'dsp/upsampling_sse2.c',
+        'dsp/yuv.c',
+      ],
+      'conditions': [
+        ['OS == "android"', {
+          'includes': [ '../../build/android/cpufeatures.gypi' ],
+        }],
+        ['order_profiling != 0', {
+          'target_conditions' : [
+            ['_toolset=="target"', {
+              'cflags!': [ '-finstrument-functions' ],
             }],
           ],
-        },
-        {
-          'target_name': 'libwebp_enc',
-          'type': 'static_library',
-          'include_dirs': ['.'],
-          'sources': [
-            'enc/alpha.c',
-            'enc/analysis.c',
-            'enc/backward_references.c',
-            'enc/config.c',
-            'enc/cost.c',
-            'enc/filter.c',
-            'enc/frame.c',
-            'enc/histogram.c',
-            'enc/iterator.c',
-            'enc/layer.c',
-            'enc/picture.c',
-            'enc/quant.c',
-            'enc/syntax.c',
-            'enc/token.c',
-            'enc/tree.c',
-            'enc/vp8l.c',
-            'enc/webpenc.c',
-          ],
-        },
-        {
-          'target_name': 'libwebp_utils',
+        }],
+      ],
+    },
+    {
+      'target_name': 'libwebp_dsp_neon',
+      'conditions': [
+        ['armv7 == 1', {
           'type': 'static_library',
           'include_dirs': ['.'],
           'sources': [
-            'utils/bit_reader.c',
-            'utils/bit_writer.c',
-            'utils/color_cache.c',
-            'utils/filters.c',
-            'utils/huffman.c',
-            'utils/huffman_encode.c',
-            'utils/quant_levels.c',
-            'utils/quant_levels_dec.c',
-            'utils/rescaler.c',
-            'utils/thread.c',
-            'utils/utils.c',
+            'dsp/dec_neon.c',
+            'dsp/enc_neon.c',
+            'dsp/upsampling_neon.c',
           ],
-        },
-        {
-          'target_name': 'libwebp',
+          # behavior similar to *.c.neon in an Android.mk
+          'cflags!': [ '-mfpu=vfpv3-d16' ],
+          'cflags': [ '-mfpu=neon' ],
+        },{  # "armv7 != 1"
           'type': 'none',
-          'dependencies' : [
-            'libwebp_dec',
-            'libwebp_demux',
-            'libwebp_dsp',
-            'libwebp_dsp_neon',
-            'libwebp_enc',
-            'libwebp_utils',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': ['.'],
-          },
-          'conditions': [
-            ['OS!="win"', {'product_name': 'webp'}],
+        }],
+        ['order_profiling != 0', {
+          'target_conditions' : [
+            ['_toolset=="target"', {
+              'cflags!': [ '-finstrument-functions' ],
+            }],
           ],
-        },
+        }],
       ],
-    }, {
-      'targets': [
-        {
-          'target_name': 'libwebp',
-          'type': 'none',
-          'direct_dependent_settings': {
-            'defines': [
-              'ENABLE_WEBP',
-            ],
-          },
-          'link_settings': {
-            'libraries': [
-              # Check for presence of webpdemux library, use it if present.
-              '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-              '--code "int main() { return 0; }" '
-              '--run-linker '
-              '--on-success "-lwebp -lwebpdemux" '
-              '--on-failure "-lwebp" '
-              '-- -lwebpdemux)',
-            ],
-          },
-        }
+    },
+    {
+      'target_name': 'libwebp_enc',
+      'type': 'static_library',
+      'include_dirs': ['.'],
+      'sources': [
+        'enc/alpha.c',
+        'enc/analysis.c',
+        'enc/backward_references.c',
+        'enc/config.c',
+        'enc/cost.c',
+        'enc/filter.c',
+        'enc/frame.c',
+        'enc/histogram.c',
+        'enc/iterator.c',
+        'enc/layer.c',
+        'enc/picture.c',
+        'enc/quant.c',
+        'enc/syntax.c',
+        'enc/token.c',
+        'enc/tree.c',
+        'enc/vp8l.c',
+        'enc/webpenc.c',
+      ],
+    },
+    {
+      'target_name': 'libwebp_utils',
+      'type': 'static_library',
+      'include_dirs': ['.'],
+      'sources': [
+        'utils/bit_reader.c',
+        'utils/bit_writer.c',
+        'utils/color_cache.c',
+        'utils/filters.c',
+        'utils/huffman.c',
+        'utils/huffman_encode.c',
+        'utils/quant_levels.c',
+        'utils/quant_levels_dec.c',
+        'utils/rescaler.c',
+        'utils/thread.c',
+        'utils/utils.c',
+      ],
+    },
+    {
+      'target_name': 'libwebp',
+      'type': 'none',
+      'dependencies' : [
+        'libwebp_dec',
+        'libwebp_demux',
+        'libwebp_dsp',
+        'libwebp_dsp_neon',
+        'libwebp_enc',
+        'libwebp_utils',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': ['.'],
+      },
+      'conditions': [
+        ['OS!="win"', {'product_name': 'webp'}],
       ],
-    }],
+    },
   ],
 }
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp
index 3d0deef..e5d32c4a 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -4,7 +4,6 @@
 
 {
   'variables': {
-    'use_system_opus%': 0,
     'conditions': [
       ['OS=="android"', {
         'use_opus_fixed_point%': 1,
@@ -13,337 +12,300 @@
       }],
     ],
   },
-  'conditions': [
-    ['use_system_opus==0', {
-      'targets': [
-        {
-          'target_name': 'opus',
-          'type': 'static_library',
+  'targets': [
+    {
+      'target_name': 'opus',
+      'type': 'static_library',
+      'defines': [
+        'OPUS_BUILD',
+        'OPUS_EXPORT=',
+      ],
+      'include_dirs': [
+        'src/celt',
+        'src/include',
+        'src/silk',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'src/include',
+        ],
+      },
+      'sources': [
+        'src/celt/_kiss_fft_guts.h',
+        'src/celt/arch.h',
+        'src/celt/bands.c',
+        'src/celt/bands.h',
+        'src/celt/celt.c',
+        'src/celt/celt.h',
+        'src/celt/celt_lpc.c',
+        'src/celt/celt_lpc.h',
+        'src/celt/cwrs.c',
+        'src/celt/cwrs.h',
+        'src/celt/ecintrin.h',
+        'src/celt/entcode.c',
+        'src/celt/entcode.h',
+        'src/celt/entdec.c',
+        'src/celt/entdec.h',
+        'src/celt/entenc.c',
+        'src/celt/entenc.h',
+        'src/celt/fixed_debug.h',
+        'src/celt/fixed_generic.h',
+        'src/celt/float_cast.h',
+        'src/celt/kiss_fft.c',
+        'src/celt/kiss_fft.h',
+        'src/celt/laplace.c',
+        'src/celt/laplace.h',
+        'src/celt/mathops.c',
+        'src/celt/mathops.h',
+        'src/celt/mdct.c',
+        'src/celt/mdct.h',
+        'src/celt/mfrngcod.h',
+        'src/celt/modes.c',
+        'src/celt/modes.h',
+        'src/celt/os_support.h',
+        'src/celt/pitch.c',
+        'src/celt/pitch.h',
+        'src/celt/quant_bands.c',
+        'src/celt/quant_bands.h',
+        'src/celt/rate.c',
+        'src/celt/rate.h',
+        'src/celt/stack_alloc.h',
+        'src/celt/static_modes_fixed.h',
+        'src/celt/static_modes_float.h',
+        'src/celt/vq.c',
+        'src/celt/vq.h',
+        'src/include/opus.h',
+        'src/include/opus_custom.h',
+        'src/include/opus_defines.h',
+        'src/include/opus_multistream.h',
+        'src/include/opus_types.h',
+        'src/silk/A2NLSF.c',
+        'src/silk/ana_filt_bank_1.c',
+        'src/silk/API.h',
+        'src/silk/biquad_alt.c',
+        'src/silk/bwexpander.c',
+        'src/silk/bwexpander_32.c',
+        'src/silk/check_control_input.c',
+        'src/silk/CNG.c',
+        'src/silk/code_signs.c',
+        'src/silk/control.h',
+        'src/silk/control_audio_bandwidth.c',
+        'src/silk/control_codec.c',
+        'src/silk/control_SNR.c',
+        'src/silk/debug.c',
+        'src/silk/debug.h',
+        'src/silk/dec_API.c',
+        'src/silk/decode_core.c',
+        'src/silk/decode_frame.c',
+        'src/silk/decode_indices.c',
+        'src/silk/decode_parameters.c',
+        'src/silk/decode_pitch.c',
+        'src/silk/decode_pulses.c',
+        'src/silk/decoder_set_fs.c',
+        'src/silk/define.h',
+        'src/silk/enc_API.c',
+        'src/silk/encode_indices.c',
+        'src/silk/encode_pulses.c',
+        'src/silk/errors.h',
+        'src/silk/fixed/apply_sine_window_FIX.c',
+        'src/silk/fixed/autocorr_FIX.c',
+        'src/silk/fixed/burg_modified_FIX.c',
+        'src/silk/fixed/corrMatrix_FIX.c',
+        'src/silk/fixed/encode_frame_FIX.c',
+        'src/silk/fixed/find_LPC_FIX.c',
+        'src/silk/fixed/find_LTP_FIX.c',
+        'src/silk/fixed/find_pitch_lags_FIX.c',
+        'src/silk/fixed/find_pred_coefs_FIX.c',
+        'src/silk/fixed/k2a_FIX.c',
+        'src/silk/fixed/k2a_Q16_FIX.c',
+        'src/silk/fixed/LTP_analysis_filter_FIX.c',
+        'src/silk/fixed/LTP_scale_ctrl_FIX.c',
+        'src/silk/fixed/main_FIX.h',
+        'src/silk/fixed/noise_shape_analysis_FIX.c',
+        'src/silk/fixed/pitch_analysis_core_FIX.c',
+        'src/silk/fixed/prefilter_FIX.c',
+        'src/silk/fixed/process_gains_FIX.c',
+        'src/silk/fixed/regularize_correlations_FIX.c',
+        'src/silk/fixed/residual_energy16_FIX.c',
+        'src/silk/fixed/residual_energy_FIX.c',
+        'src/silk/fixed/schur64_FIX.c',
+        'src/silk/fixed/schur_FIX.c',
+        'src/silk/fixed/solve_LS_FIX.c',
+        'src/silk/fixed/structs_FIX.h',
+        'src/silk/fixed/vector_ops_FIX.c',
+        'src/silk/fixed/warped_autocorrelation_FIX.c',
+        'src/silk/fixed/structs_FIX.h',
+        'src/silk/float/apply_sine_window_FLP.c',
+        'src/silk/float/autocorrelation_FLP.c',
+        'src/silk/float/burg_modified_FLP.c',
+        'src/silk/float/bwexpander_FLP.c',
+        'src/silk/float/corrMatrix_FLP.c',
+        'src/silk/float/encode_frame_FLP.c',
+        'src/silk/float/energy_FLP.c',
+        'src/silk/float/find_LPC_FLP.c',
+        'src/silk/float/find_LTP_FLP.c',
+        'src/silk/float/find_pitch_lags_FLP.c',
+        'src/silk/float/find_pred_coefs_FLP.c',
+        'src/silk/float/inner_product_FLP.c',
+        'src/silk/float/k2a_FLP.c',
+        'src/silk/float/levinsondurbin_FLP.c',
+        'src/silk/float/LPC_analysis_filter_FLP.c',
+        'src/silk/float/LPC_inv_pred_gain_FLP.c',
+        'src/silk/float/LTP_analysis_filter_FLP.c',
+        'src/silk/float/LTP_scale_ctrl_FLP.c',
+        'src/silk/float/main_FLP.h',
+        'src/silk/float/noise_shape_analysis_FLP.c',
+        'src/silk/float/pitch_analysis_core_FLP.c',
+        'src/silk/float/prefilter_FLP.c',
+        'src/silk/float/process_gains_FLP.c',
+        'src/silk/float/regularize_correlations_FLP.c',
+        'src/silk/float/residual_energy_FLP.c',
+        'src/silk/float/scale_copy_vector_FLP.c',
+        'src/silk/float/scale_vector_FLP.c',
+        'src/silk/float/schur_FLP.c',
+        'src/silk/float/SigProc_FLP.h',
+        'src/silk/float/solve_LS_FLP.c',
+        'src/silk/float/sort_FLP.c',
+        'src/silk/float/structs_FLP.h',
+        'src/silk/float/warped_autocorrelation_FLP.c',
+        'src/silk/float/wrappers_FLP.c',
+        'src/silk/gain_quant.c',
+        'src/silk/HP_variable_cutoff.c',
+        'src/silk/init_decoder.c',
+        'src/silk/init_encoder.c',
+        'src/silk/Inlines.h',
+        'src/silk/inner_prod_aligned.c',
+        'src/silk/interpolate.c',
+        'src/silk/lin2log.c',
+        'src/silk/log2lin.c',
+        'src/silk/LP_variable_cutoff.c',
+        'src/silk/LPC_analysis_filter.c',
+        'src/silk/LPC_inv_pred_gain.c',
+        'src/silk/MacroCount.h',
+        'src/silk/MacroDebug.h',
+        'src/silk/macros.h',
+        'src/silk/main.h',
+        'src/silk/NLSF2A.c',
+        'src/silk/NLSF_decode.c',
+        'src/silk/NLSF_del_dec_quant.c',
+        'src/silk/NLSF_encode.c',
+        'src/silk/NLSF_stabilize.c',
+        'src/silk/NLSF_unpack.c',
+        'src/silk/NLSF_VQ.c',
+        'src/silk/NLSF_VQ_weights_laroia.c',
+        'src/silk/NSQ.c',
+        'src/silk/NSQ_del_dec.c',
+        'src/silk/pitch_est_defines.h',
+        'src/silk/pitch_est_tables.c',
+        'src/silk/PLC.c',
+        'src/silk/PLC.h',
+        'src/silk/process_NLSFs.c',
+        'src/silk/quant_LTP_gains.c',
+        'src/silk/resampler.c',
+        'src/silk/resampler_down2.c',
+        'src/silk/resampler_down2_3.c',
+        'src/silk/resampler_private.h',
+        'src/silk/resampler_private_AR2.c',
+        'src/silk/resampler_private_down_FIR.c',
+        'src/silk/resampler_private_IIR_FIR.c',
+        'src/silk/resampler_private_up2_HQ.c',
+        'src/silk/resampler_rom.c',
+        'src/silk/resampler_rom.h',
+        'src/silk/resampler_structs.h',
+        'src/silk/shell_coder.c',
+        'src/silk/sigm_Q15.c',
+        'src/silk/SigProc_FIX.h',
+        'src/silk/sort.c',
+        'src/silk/stereo_decode_pred.c',
+        'src/silk/stereo_encode_pred.c',
+        'src/silk/stereo_find_predictor.c',
+        'src/silk/stereo_LR_to_MS.c',
+        'src/silk/stereo_MS_to_LR.c',
+        'src/silk/stereo_quant_pred.c',
+        'src/silk/structs.h',
+        'src/silk/sum_sqr_shift.c',
+        'src/silk/table_LSF_cos.c',
+        'src/silk/tables.h',
+        'src/silk/tables_gain.c',
+        'src/silk/tables_LTP.c',
+        'src/silk/tables_NLSF_CB_NB_MB.c',
+        'src/silk/tables_NLSF_CB_WB.c',
+        'src/silk/tables_other.c',
+        'src/silk/tables_pitch_lag.c',
+        'src/silk/tables_pulses_per_block.c',
+        'src/silk/tuning_parameters.h',
+        'src/silk/typedef.h',
+        'src/silk/VAD.c',
+        'src/silk/VQ_WMat_EC.c',
+        'src/src/opus.c',
+        'src/src/opus_decoder.c',
+        'src/src/opus_encoder.c',
+        'src/src/opus_multistream.c',
+        'src/src/repacketizer.c',
+      ],
+      'conditions': [
+        ['OS!="win"', {
           'defines': [
-            'OPUS_BUILD',
-            'OPUS_EXPORT=',
+            'HAVE_LRINT',
+            'HAVE_LRINTF',
+            'VAR_ARRAYS',
           ],
-          'include_dirs': [
-            'src/celt',
-            'src/include',
-            'src/silk',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              'src/include',
-            ],
-          },
-          'sources': [
-            'src/celt/_kiss_fft_guts.h',
-            'src/celt/arch.h',
-            'src/celt/bands.c',
-            'src/celt/bands.h',
-            'src/celt/celt.c',
-            'src/celt/celt.h',
-            'src/celt/celt_lpc.c',
-            'src/celt/celt_lpc.h',
-            'src/celt/cwrs.c',
-            'src/celt/cwrs.h',
-            'src/celt/ecintrin.h',
-            'src/celt/entcode.c',
-            'src/celt/entcode.h',
-            'src/celt/entdec.c',
-            'src/celt/entdec.h',
-            'src/celt/entenc.c',
-            'src/celt/entenc.h',
-            'src/celt/fixed_debug.h',
-            'src/celt/fixed_generic.h',
-            'src/celt/float_cast.h',
-            'src/celt/kiss_fft.c',
-            'src/celt/kiss_fft.h',
-            'src/celt/laplace.c',
-            'src/celt/laplace.h',
-            'src/celt/mathops.c',
-            'src/celt/mathops.h',
-            'src/celt/mdct.c',
-            'src/celt/mdct.h',
-            'src/celt/mfrngcod.h',
-            'src/celt/modes.c',
-            'src/celt/modes.h',
-            'src/celt/os_support.h',
-            'src/celt/pitch.c',
-            'src/celt/pitch.h',
-            'src/celt/quant_bands.c',
-            'src/celt/quant_bands.h',
-            'src/celt/rate.c',
-            'src/celt/rate.h',
-            'src/celt/stack_alloc.h',
-            'src/celt/static_modes_fixed.h',
-            'src/celt/static_modes_float.h',
-            'src/celt/vq.c',
-            'src/celt/vq.h',
-            'src/include/opus.h',
-            'src/include/opus_custom.h',
-            'src/include/opus_defines.h',
-            'src/include/opus_multistream.h',
-            'src/include/opus_types.h',
-            'src/silk/A2NLSF.c',
-            'src/silk/ana_filt_bank_1.c',
-            'src/silk/API.h',
-            'src/silk/biquad_alt.c',
-            'src/silk/bwexpander.c',
-            'src/silk/bwexpander_32.c',
-            'src/silk/check_control_input.c',
-            'src/silk/CNG.c',
-            'src/silk/code_signs.c',
-            'src/silk/control.h',
-            'src/silk/control_audio_bandwidth.c',
-            'src/silk/control_codec.c',
-            'src/silk/control_SNR.c',
-            'src/silk/debug.c',
-            'src/silk/debug.h',
-            'src/silk/dec_API.c',
-            'src/silk/decode_core.c',
-            'src/silk/decode_frame.c',
-            'src/silk/decode_indices.c',
-            'src/silk/decode_parameters.c',
-            'src/silk/decode_pitch.c',
-            'src/silk/decode_pulses.c',
-            'src/silk/decoder_set_fs.c',
-            'src/silk/define.h',
-            'src/silk/enc_API.c',
-            'src/silk/encode_indices.c',
-            'src/silk/encode_pulses.c',
-            'src/silk/errors.h',
-            'src/silk/fixed/apply_sine_window_FIX.c',
-            'src/silk/fixed/autocorr_FIX.c',
-            'src/silk/fixed/burg_modified_FIX.c',
-            'src/silk/fixed/corrMatrix_FIX.c',
-            'src/silk/fixed/encode_frame_FIX.c',
-            'src/silk/fixed/find_LPC_FIX.c',
-            'src/silk/fixed/find_LTP_FIX.c',
-            'src/silk/fixed/find_pitch_lags_FIX.c',
-            'src/silk/fixed/find_pred_coefs_FIX.c',
-            'src/silk/fixed/k2a_FIX.c',
-            'src/silk/fixed/k2a_Q16_FIX.c',
-            'src/silk/fixed/LTP_analysis_filter_FIX.c',
-            'src/silk/fixed/LTP_scale_ctrl_FIX.c',
-            'src/silk/fixed/main_FIX.h',
-            'src/silk/fixed/noise_shape_analysis_FIX.c',
-            'src/silk/fixed/pitch_analysis_core_FIX.c',
-            'src/silk/fixed/prefilter_FIX.c',
-            'src/silk/fixed/process_gains_FIX.c',
-            'src/silk/fixed/regularize_correlations_FIX.c',
-            'src/silk/fixed/residual_energy16_FIX.c',
-            'src/silk/fixed/residual_energy_FIX.c',
-            'src/silk/fixed/schur64_FIX.c',
-            'src/silk/fixed/schur_FIX.c',
-            'src/silk/fixed/solve_LS_FIX.c',
-            'src/silk/fixed/structs_FIX.h',
-            'src/silk/fixed/vector_ops_FIX.c',
-            'src/silk/fixed/warped_autocorrelation_FIX.c',
-            'src/silk/fixed/structs_FIX.h',
-            'src/silk/float/apply_sine_window_FLP.c',
-            'src/silk/float/autocorrelation_FLP.c',
-            'src/silk/float/burg_modified_FLP.c',
-            'src/silk/float/bwexpander_FLP.c',
-            'src/silk/float/corrMatrix_FLP.c',
-            'src/silk/float/encode_frame_FLP.c',
-            'src/silk/float/energy_FLP.c',
-            'src/silk/float/find_LPC_FLP.c',
-            'src/silk/float/find_LTP_FLP.c',
-            'src/silk/float/find_pitch_lags_FLP.c',
-            'src/silk/float/find_pred_coefs_FLP.c',
-            'src/silk/float/inner_product_FLP.c',
-            'src/silk/float/k2a_FLP.c',
-            'src/silk/float/levinsondurbin_FLP.c',
-            'src/silk/float/LPC_analysis_filter_FLP.c',
-            'src/silk/float/LPC_inv_pred_gain_FLP.c',
-            'src/silk/float/LTP_analysis_filter_FLP.c',
-            'src/silk/float/LTP_scale_ctrl_FLP.c',
-            'src/silk/float/main_FLP.h',
-            'src/silk/float/noise_shape_analysis_FLP.c',
-            'src/silk/float/pitch_analysis_core_FLP.c',
-            'src/silk/float/prefilter_FLP.c',
-            'src/silk/float/process_gains_FLP.c',
-            'src/silk/float/regularize_correlations_FLP.c',
-            'src/silk/float/residual_energy_FLP.c',
-            'src/silk/float/scale_copy_vector_FLP.c',
-            'src/silk/float/scale_vector_FLP.c',
-            'src/silk/float/schur_FLP.c',
-            'src/silk/float/SigProc_FLP.h',
-            'src/silk/float/solve_LS_FLP.c',
-            'src/silk/float/sort_FLP.c',
-            'src/silk/float/structs_FLP.h',
-            'src/silk/float/warped_autocorrelation_FLP.c',
-            'src/silk/float/wrappers_FLP.c',
-            'src/silk/gain_quant.c',
-            'src/silk/HP_variable_cutoff.c',
-            'src/silk/init_decoder.c',
-            'src/silk/init_encoder.c',
-            'src/silk/Inlines.h',
-            'src/silk/inner_prod_aligned.c',
-            'src/silk/interpolate.c',
-            'src/silk/lin2log.c',
-            'src/silk/log2lin.c',
-            'src/silk/LP_variable_cutoff.c',
-            'src/silk/LPC_analysis_filter.c',
-            'src/silk/LPC_inv_pred_gain.c',
-            'src/silk/MacroCount.h',
-            'src/silk/MacroDebug.h',
-            'src/silk/macros.h',
-            'src/silk/main.h',
-            'src/silk/NLSF2A.c',
-            'src/silk/NLSF_decode.c',
-            'src/silk/NLSF_del_dec_quant.c',
-            'src/silk/NLSF_encode.c',
-            'src/silk/NLSF_stabilize.c',
-            'src/silk/NLSF_unpack.c',
-            'src/silk/NLSF_VQ.c',
-            'src/silk/NLSF_VQ_weights_laroia.c',
-            'src/silk/NSQ.c',
-            'src/silk/NSQ_del_dec.c',
-            'src/silk/pitch_est_defines.h',
-            'src/silk/pitch_est_tables.c',
-            'src/silk/PLC.c',
-            'src/silk/PLC.h',
-            'src/silk/process_NLSFs.c',
-            'src/silk/quant_LTP_gains.c',
-            'src/silk/resampler.c',
-            'src/silk/resampler_down2.c',
-            'src/silk/resampler_down2_3.c',
-            'src/silk/resampler_private.h',
-            'src/silk/resampler_private_AR2.c',
-            'src/silk/resampler_private_down_FIR.c',
-            'src/silk/resampler_private_IIR_FIR.c',
-            'src/silk/resampler_private_up2_HQ.c',
-            'src/silk/resampler_rom.c',
-            'src/silk/resampler_rom.h',
-            'src/silk/resampler_structs.h',
-            'src/silk/shell_coder.c',
-            'src/silk/sigm_Q15.c',
-            'src/silk/SigProc_FIX.h',
-            'src/silk/sort.c',
-            'src/silk/stereo_decode_pred.c',
-            'src/silk/stereo_encode_pred.c',
-            'src/silk/stereo_find_predictor.c',
-            'src/silk/stereo_LR_to_MS.c',
-            'src/silk/stereo_MS_to_LR.c',
-            'src/silk/stereo_quant_pred.c',
-            'src/silk/structs.h',
-            'src/silk/sum_sqr_shift.c',
-            'src/silk/table_LSF_cos.c',
-            'src/silk/tables.h',
-            'src/silk/tables_gain.c',
-            'src/silk/tables_LTP.c',
-            'src/silk/tables_NLSF_CB_NB_MB.c',
-            'src/silk/tables_NLSF_CB_WB.c',
-            'src/silk/tables_other.c',
-            'src/silk/tables_pitch_lag.c',
-            'src/silk/tables_pulses_per_block.c',
-            'src/silk/tuning_parameters.h',
-            'src/silk/typedef.h',
-            'src/silk/VAD.c',
-            'src/silk/VQ_WMat_EC.c',
-            'src/src/opus.c',
-            'src/src/opus_decoder.c',
-            'src/src/opus_encoder.c',
-            'src/src/opus_multistream.c',
-            'src/src/repacketizer.c',
+        }, {
+          'defines': [
+            'USE_ALLOCA',
+            'inline=__inline',
           ],
-          'conditions': [
-            ['OS!="win"', {
-              'defines': [
-                'HAVE_LRINT',
-                'HAVE_LRINTF',
-                'VAR_ARRAYS',
-              ],
-            }, {
-              'defines': [
-                'USE_ALLOCA',
-                'inline=__inline',
-              ],
-              'msvs_disabled_warnings': [
-                4305,  # Disable truncation warning in celt/pitch.c .
-              ],
-            }],
-            ['use_opus_fixed_point==0', {
-              'include_dirs': [
-                'src/silk/float',
-              ],
-              'sources/': [
-                ['exclude', '/fixed/[^/]*_FIX.(h|c)$'],
-              ],
-            }, {
-              'defines': [
-                'FIXED_POINT',
-              ],
-              'include_dirs': [
-                'src/silk/fixed',
-              ],
-              'sources/': [
-                ['exclude', '/float/[^/]*_FLP.(h|c)$'],
-              ],
-            }],
+          'msvs_disabled_warnings': [
+            4305,  # Disable truncation warning in celt/pitch.c .
           ],
-        },  # target opus
-        {
-          'target_name': 'opus_demo',
-          'type': 'executable',
-          'dependencies': [
-            'opus'
+        }],
+        ['use_opus_fixed_point==0', {
+          'include_dirs': [
+            'src/silk/float',
           ],
-          'conditions': [
-            ['OS == "win"', {
-              'defines': [
-                'inline=__inline',
-              ],
-            }],
-            ['OS=="android"', {
-              'link_settings': {
-                'libraries': [
-                  '-llog',
-                ],
-              },
-            }]
+          'sources/': [
+            ['exclude', '/fixed/[^/]*_FIX.(h|c)$'],
           ],
-          'sources': [
-            'src/src/opus_demo.c',
+        }, {
+          'defines': [
+            'FIXED_POINT',
           ],
           'include_dirs': [
-            'src/celt',
-            'src/silk',
+            'src/silk/fixed',
           ],
-        },  # target opus_demo
-      ]
-    }, {  # use_system_opus != 0
-      'targets': [
-        {
-          'target_name': 'opus',
-          'type': 'none',
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(pkg-config --cflags opus)',
-            ],
-          },
-          'variables': {
-            'headers_root_path': 'src/include',
-            'header_filenames': [
-              'opus_custom.h',
-              'opus_defines.h',
-              'opus_multistream.h',
-              'opus_types.h',
-              'opus.h',
-            ],
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
+          'sources/': [
+            ['exclude', '/float/[^/]*_FLP.(h|c)$'],
+          ],
+        }],
+      ],
+    },  # target opus
+    {
+      'target_name': 'opus_demo',
+      'type': 'executable',
+      'dependencies': [
+        'opus'
+      ],
+      'conditions': [
+        ['OS == "win"', {
+          'defines': [
+            'inline=__inline',
           ],
+        }],
+        ['OS=="android"', {
           'link_settings': {
-            'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other opus)',
-            ],
             'libraries': [
-              '<!@(pkg-config --libs-only-l opus)',
+              '-llog',
             ],
           },
-        },  # target opus
+        }]
+      ],
+      'sources': [
+        'src/src/opus_demo.c',
+      ],
+      'include_dirs': [
+        'src/celt',
+        'src/silk',
       ],
-    }],
-  ],
+    },  # target opus_demo
+  ]
 }
diff --git a/third_party/re2/re2.gyp b/third_party/re2/re2.gyp
index 4608945..99906ef 100644
--- a/third_party/re2/re2.gyp
+++ b/third_party/re2/re2.gyp
@@ -3,121 +3,82 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'use_system_re2%': 0,
-  },
-  'conditions': [
-    ['use_system_re2==0', {
-      'targets': [
-        {
-          'target_name': 're2',
-          'type': 'static_library',
-          'include_dirs': [
-            '.',
-            '<(DEPTH)',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '.',
-              '<(DEPTH)',
-            ],
-          },
-          'dependencies': [
-            '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-          ],
+  'targets': [
+    {
+      'target_name': 're2',
+      'type': 'static_library',
+      'include_dirs': [
+        '.',
+        '<(DEPTH)',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '.',
+          '<(DEPTH)',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+      ],
+      'sources': [
+        're2/bitstate.cc',
+        're2/compile.cc',
+        're2/dfa.cc',
+        're2/filtered_re2.cc',
+        're2/filtered_re2.h',
+        're2/mimics_pcre.cc',
+        're2/nfa.cc',
+        're2/onepass.cc',
+        're2/parse.cc',
+        're2/perl_groups.cc',
+        're2/prefilter.cc',
+        're2/prefilter.h',
+        're2/prefilter_tree.cc',
+        're2/prefilter_tree.h',
+        're2/prog.cc',
+        're2/prog.h',
+        're2/re2.cc',
+        're2/re2.h',
+        're2/regexp.cc',
+        're2/regexp.h',
+        're2/set.cc',
+        're2/set.h',
+        're2/simplify.cc',
+        're2/stringpiece.h',
+        're2/tostring.cc',
+        're2/unicode_casefold.cc',
+        're2/unicode_casefold.h',
+        're2/unicode_groups.cc',
+        're2/unicode_groups.h',
+        're2/variadic_function.h',
+        're2/walker-inl.h',
+        'util/arena.cc',
+        'util/arena.h',
+        'util/atomicops.h',
+        'util/flags.h',
+        'util/hash.cc',
+        'util/logging.h',
+        'util/mutex.h',
+        'util/rune.cc',
+        'util/sparse_array.h',
+        'util/sparse_set.h',
+        'util/stringpiece.cc',
+        'util/stringprintf.cc',
+        'util/strutil.cc',
+        'util/utf.h',
+        'util/util.h',
+      ],
+      'conditions': [
+        ['OS=="win"', {
           'sources': [
-            're2/bitstate.cc',
-            're2/compile.cc',
-            're2/dfa.cc',
-            're2/filtered_re2.cc',
-            're2/filtered_re2.h',
-            're2/mimics_pcre.cc',
-            're2/nfa.cc',
-            're2/onepass.cc',
-            're2/parse.cc',
-            're2/perl_groups.cc',
-            're2/prefilter.cc',
-            're2/prefilter.h',
-            're2/prefilter_tree.cc',
-            're2/prefilter_tree.h',
-            're2/prog.cc',
-            're2/prog.h',
-            're2/re2.cc',
-            're2/re2.h',
-            're2/regexp.cc',
-            're2/regexp.h',
-            're2/set.cc',
-            're2/set.h',
-            're2/simplify.cc',
-            're2/stringpiece.h',
-            're2/tostring.cc',
-            're2/unicode_casefold.cc',
-            're2/unicode_casefold.h',
-            're2/unicode_groups.cc',
-            're2/unicode_groups.h',
-            're2/variadic_function.h',
-            're2/walker-inl.h',
-            'util/arena.cc',
-            'util/arena.h',
-            'util/atomicops.h',
-            'util/flags.h',
-            'util/hash.cc',
-            'util/logging.h',
-            'util/mutex.h',
-            'util/rune.cc',
-            'util/sparse_array.h',
-            'util/sparse_set.h',
-            'util/stringpiece.cc',
-            'util/stringprintf.cc',
-            'util/strutil.cc',
-            'util/utf.h',
-            'util/util.h',
+            'mswin/stdint.h'
           ],
-          'conditions': [
-            ['OS=="win"', {
-              'sources': [
-                'mswin/stdint.h'
-              ],
-              'include_dirs': [
-                'mswin'
-              ],
-              'msvs_disabled_warnings': [ 4018, 4722, 4267 ],
-            }]
-          ]
-        },
-      ],
-    }, { # use_system_re2==1
-      'targets': [
-        {
-          'target_name': 're2',
-          'type': 'none',
-          'variables': {
-            'headers_root_path': '.',
-            'header_filenames': [
-              're2/filtered_re2.h',
-              're2/re2.h',
-              're2/set.h',
-              're2/stringpiece.h',
-              're2/variadic_function.h',
-            ],
-            'shim_generator_additional_args': [
-              # Chromium copy of re2 is patched to rename POSIX to POSIX_SYNTAX
-              # because of collision issues that break the build.
-              # Upstream refuses to make changes:
-              # http://code.google.com/p/re2/issues/detail?id=73 .
-              '--define', 'POSIX=POSIX_SYNTAX',
-            ],
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
+          'include_dirs': [
+            'mswin'
           ],
-          'link_settings': {
-            'libraries': [
-              '-lre2',
-            ],
-          },
-        }
-      ],
-    }],
+          'msvs_disabled_warnings': [ 4018, 4722, 4267 ],
+        }]
+      ]
+    },
   ],
 }
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 2ce2e3c..069fb63 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -3,143 +3,88 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'conditions': [
-      [ 'OS=="none"', {
-        # Because we have a patched zlib, we cannot use the system libz.
-        # TODO(pvalchev): OpenBSD is purposefully left out, as the system
-        # zlib brings up an incompatibility that breaks rendering.
-        'use_system_zlib%': 1,
-      }, {
-        'use_system_zlib%': 0,
-      }],
-    ],
-    'use_system_minizip%': 0,
-  },
   'targets': [
     {
       'target_name': 'zlib',
       'type': 'static_library',
+      'sources': [
+        'adler32.c',
+        'compress.c',
+        'crc32.c',
+        'crc32.h',
+        'deflate.c',
+        'deflate.h',
+        'gzclose.c',
+        'gzguts.h',
+        'gzlib.c',
+        'gzread.c',
+        'gzwrite.c',
+        'infback.c',
+        'inffast.c',
+        'inffast.h',
+        'inffixed.h',
+        'inflate.c',
+        'inflate.h',
+        'inftrees.c',
+        'inftrees.h',
+        'mozzconf.h',
+        'trees.c',
+        'trees.h',
+        'uncompr.c',
+        'zconf.h',
+        'zlib.h',
+        'zutil.c',
+        'zutil.h',
+      ],
+      'include_dirs': [
+        '.',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '.',
+        ],
+      },
       'conditions': [
-        ['use_system_zlib==0', {
-          'sources': [
-            'adler32.c',
-            'compress.c',
-            'crc32.c',
-            'crc32.h',
-            'deflate.c',
-            'deflate.h',
-            'gzclose.c',
-            'gzguts.h',
-            'gzlib.c',
-            'gzread.c',
-            'gzwrite.c',
-            'infback.c',
-            'inffast.c',
-            'inffast.h',
-            'inffixed.h',
-            'inflate.c',
-            'inflate.h',
-            'inftrees.c',
-            'inftrees.h',
-            'mozzconf.h',
-            'trees.c',
-            'trees.h',
-            'uncompr.c',
-            'zconf.h',
-            'zlib.h',
-            'zutil.c',
-            'zutil.h',
-          ],
-          'include_dirs': [
-            '.',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '.',
-            ],
-          },
-          'conditions': [
-            ['OS!="win"', {
-              'product_name': 'chrome_zlib',
-            }], ['OS=="android"', {
-              'toolsets': ['target', 'host'],
-            }],
-          ],
-        }, {
-          'variables': {
-            'headers_root_path': '.',
-            'header_filenames': [
-              'zlib.h',
-            ],
-          },
-          'includes': [
-            '../../build/shim_headers.gypi',
-          ],
-          'direct_dependent_settings': {
-            'defines': [
-              'USE_SYSTEM_ZLIB',
-            ],
-          },
-          'link_settings': {
-            'libraries': [
-              '-lz',
-            ],
-          },
+        ['OS!="win"', {
+          'product_name': 'chrome_zlib',
+        }], ['OS=="android"', {
+          'toolsets': ['target', 'host'],
         }],
       ],
     },
     {
       'target_name': 'minizip',
       'type': 'static_library',
+      'sources': [
+        'contrib/minizip/ioapi.c',
+        'contrib/minizip/ioapi.h',
+        'contrib/minizip/iowin32.c',
+        'contrib/minizip/iowin32.h',
+        'contrib/minizip/unzip.c',
+        'contrib/minizip/unzip.h',
+        'contrib/minizip/zip.c',
+        'contrib/minizip/zip.h',
+      ],
+      'dependencies': [
+        'zlib',
+      ],
+      'include_dirs': [
+        '.',
+        '../..',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '.',
+        ],
+      },
       'conditions': [
-        ['use_system_minizip==0', {
-          'sources': [
-            'contrib/minizip/ioapi.c',
-            'contrib/minizip/ioapi.h',
-            'contrib/minizip/iowin32.c',
-            'contrib/minizip/iowin32.h',
-            'contrib/minizip/unzip.c',
-            'contrib/minizip/unzip.h',
-            'contrib/minizip/zip.c',
-            'contrib/minizip/zip.h',
-          ],
-          'dependencies': [
-            'zlib',
-          ],
-          'include_dirs': [
-            '.',
-            '../..',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '.',
-            ],
-          },
-          'conditions': [
-            ['OS!="win"', {
-              'sources!': [
-                'contrib/minizip/iowin32.c'
-              ],
-            }],
-            ['OS=="android"', {
-              'toolsets': ['target', 'host'],
-            }],
+        ['OS!="win"', {
+          'sources!': [
+            'contrib/minizip/iowin32.c'
           ],
-        }, {
-          'all_dependent_settings': {
-            'defines': [
-              'USE_SYSTEM_MINIZIP',
-            ],
-          },
-          'defines': [
-            'USE_SYSTEM_MINIZIP',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lminizip',
-            ],
-          },
+        }],
+        ['OS=="android"', {
+          'toolsets': ['target', 'host'],
         }],
         ['OS=="mac" or OS=="ios" or os_bsd==1 or OS=="android"', {
           # Mac, Android and the BSDs don't have fopen64, ftello64, or