8 files changed, 50 insertions, 25 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 8752c1f..ca1666d 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    'common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'All',
diff --git a/build/common.gypi b/build/common.gypi
index 757c8c5..5b2d0b6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2,6 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# IMPORTANT:
+# Please don't directly include this file if you are building via gyp_chromium,
+# since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
diff --git a/build/gyp_chromium b/build/gyp_chromium
new file mode 100644
index 0000000..017d298
--- /dev/null
+++ b/build/gyp_chromium
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+# This script is wrapper for Chromium that adds some support for how GYP
+# is invoked by Chromium beyond what can be done it the gclient hooks.
+
+import glob
+import os
+import shlex
+import sys
+
+print 'Updating projects from gyp files...'
+
+try:
+  import gyp
+except ImportError, e:
+  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../tools/gyp/pylib'))
+  import gyp
+
+if __name__ == '__main__':
+  args = sys.argv[1:]
+
+  # If we didn't get a file, check an env var, and then fall back to
+  # assuming 'src/build/all.gyp'
+  if len(args) == 0:
+    args += shlex.split(os.environ.get('CHROMIUM_GYP_FILE',
+                                       'src/build/all.gyp'))
+
+  # Always include gyp_chromium.gypi
+  args += ['-I', os.path.join(os.path.dirname(sys.argv[0]),'common.gypi')]
+  
+  # Optionally add supplemental .gypi files if present.
+  supplements = glob.glob('src/*/supplement.gypi')
+  for supplement in supplements:
+    args += ['-I', supplement]
+
+  # Off we go...
+  sys.exit(gyp.main(args))
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 5275373..6bed8e3 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -3,18 +3,18 @@
 # found in the LICENSE file.
 
 {
-  'variables' : {
-    'includes': [
-      '../common.gypi',
-    ],
-    'conditions': [
-      ['sysroot!=""', {
+  'conditions': [
+    ['sysroot!=""', {
+      'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
-      }, {
+      },
+    }, {
+      'variables': {
         'pkg-config': 'pkg-config'
-      }],
-    ],
-  },
+      },
+    }],
+  ],
+  
   'targets': [
     {
       'target_name': 'gtk',
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index 4fbab83..ef958bd 100644
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/temp_gyp/googleurl.gyp
@@ -7,9 +7,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'googleurl',
diff --git a/build/temp_gyp/pdfsqueeze.gyp b/build/temp_gyp/pdfsqueeze.gyp
index 1478410..2b3b1ff 100644
--- a/build/temp_gyp/pdfsqueeze.gyp
+++ b/build/temp_gyp/pdfsqueeze.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'pdfsqueeze',
diff --git a/build/util/build_util.gyp b/build/util/build_util.gyp
index ad17be6..1d867cc 100644
--- a/build/util/build_util.gyp
+++ b/build/util/build_util.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'lastchange',
diff --git a/build/win/system.gyp b/build/win/system.gyp
index 75db468..bc29e82 100644
--- a/build/win/system.gyp
+++ b/build/win/system.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'cygwin',