Force inclusion of build/common.gypi for all chromium gyp files.

Why: Simpler build code. If everybody includes it, it should be included automatically.
Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi.

What was done:
1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi
2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi.
3. lots of gyp files were fixed to not refer to build/common.gypi any more.
4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too.
5. build/common.gypi was left empty, because there are some external projects that still refer to it.

Things that are left to do after this patch is in:
1. The following external files (in other repositories) need to stop include common.gypi
  ./third_party/hunspell/hunspell.gyp
  ./third_party/icu/icu.gyp
  ./v8/tools/gyp/v8.gyp
2. Once nobody refers to common.gypi anymore, delete common.gypi
   -or-
   Delete gyp_chromium.gypi and move its content back to common.gypi

Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify.

Review URL: http://codereview.chromium.org/206006

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

62 files changed, 80 insertions, 180 deletions

diff --git a/DEPS b/DEPS
index e022bf4..1136b61 100644
--- a/DEPS
+++ b/DEPS
@@ -24,10 +24,10 @@ deps = {
     "/trunk/deps/third_party/WebKit@20601",
 
   "src/third_party/icu":
-    "/trunk/deps/third_party/icu42@25717",
+    "/trunk/deps/third_party/icu42@26240",
 
   "src/third_party/hunspell":
-   "/trunk/deps/third_party/hunspell128@25906",
+   "/trunk/deps/third_party/hunspell128@26238",
 
   "src/third_party/protobuf2/src":
     "http://protobuf.googlecode.com/svn/trunk@219",
@@ -36,7 +36,7 @@ deps = {
     "http://gyp.googlecode.com/svn/trunk@651",
 
   "src/v8":
-    "http://v8.googlecode.com/svn/trunk@2891",
+    "http://v8.googlecode.com/svn/trunk@2896",
 
   "src/native_client":
     "http://nativeclient.googlecode.com/svn/trunk/src/native_client@385",
@@ -156,8 +156,8 @@ skip_child_includes = [
 hooks = [
   {
     # A change to a .gyp, .gypi, or to GYP itself shound run the generator.
-    "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]",
-    "action": ["python", "src/tools/gyp/gyp_chromium"],
+    "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\\\]build[/\\\\]gyp_chromium$",
+    "action": ["python", "src/build/gyp_chromium"],
   },
   {
     # Workaround IncrediBuild problem. http://crbug.com/17706.
diff --git a/app/app.gyp b/app/app.gyp
index e58b762..4149e4c 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'target_defaults': {
     'sources/': [
       ['exclude', '/(cocoa|gtk|win)/'],
diff --git a/base/base.gyp b/base/base.gyp
index 8c0ed39..c56839d 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'base',
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index 4c2721c..988cfd1 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'conditions': [
     [ 'OS=="mac"', {
       'target_defaults': {
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',
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
index 0fbffd8..b2406b7 100644
--- a/chrome/app/locales/locales.gyp
+++ b/chrome/app/locales/locales.gyp
@@ -8,9 +8,6 @@
     # TODO(sgk): eliminate this; see comment in build/common.gypi
     'msvs_debug_link_incremental': '1',
   },
-  'includes': [
-    '../../../build/common.gypi',
-  ],
   'target_defaults': {
     'type': 'loadable_module',
     'dependencies': [
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 4d6f99b..4a27429 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -144,9 +144,6 @@
       }],
     ],  # conditions
   },  # variables
-  'includes': [
-    '../build/common.gypi',
-  ],
   'target_defaults': {
     'sources/': [
       ['exclude', '/(cocoa|gtk|win)/'],
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index d5f3643..f2569f7 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -5,9 +5,6 @@
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 4389884..e48ed62 100755
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -7,9 +7,6 @@
     'msvs_use_common_release': 0,
     'msvs_use_common_linker_extras': 0,
   },
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
diff --git a/chrome/test/security_tests/security_tests.gyp b/chrome/test/security_tests/security_tests.gyp
index 8588983..c0a21f2 100644
--- a/chrome/test/security_tests/security_tests.gyp
+++ b/chrome/test/security_tests/security_tests.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'security_tests',
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index d53fb90..ebe3981 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'courgette_lib',
diff --git a/gears/gears.gyp b/gears/gears.gyp
index f055115..3c38093 100755
--- a/gears/gears.gyp
+++ b/gears/gears.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'conditions': [
     [ 'OS == "win"', {
       'targets': [
diff --git a/google_update/google_update.gyp b/google_update/google_update.gyp
index 40f95e5..682715c 100644
--- a/google_update/google_update.gyp
+++ b/google_update/google_update.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'google_update',
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index e381e397..db2e609 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'target_defaults': {
     'sources/': [
       ['exclude', '/win/'],
diff --git a/media/media.gyp b/media/media.gyp
index 896374c..29b4ac0 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'target_defaults': {
     'conditions': [
       ['OS!="linux"', {'sources/': [['exclude', '/linux/']]}],
diff --git a/net/net.gyp b/net/net.gyp
index 5fed81d..c456d98 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'net',
diff --git a/net/tools/tld_cleanup/tld_cleanup.gyp b/net/tools/tld_cleanup/tld_cleanup.gyp
index 73996f1..245df98 100644
--- a/net/tools/tld_cleanup/tld_cleanup.gyp
+++ b/net/tools/tld_cleanup/tld_cleanup.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'tld_cleanup',
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index dcf7530..737f78c 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -145,7 +145,7 @@ hooks = [
   {
     # A change to a .gyp, .gypi, or to GYP itself shound run the generator.
     "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|MANIFEST$",
-    "action": ["python", "tools/gyp/gyp", "o3d/build/all.gyp", "--depth", ".",
+    "action": ["python", "build/gyp_o3d", "build/all.gyp", "--depth", ".",
         "-D", "support_macosx_10_4=1"],
   },
 ]
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp
index 1996704..0a9f33a 100644
--- a/o3d/build/all.gyp
+++ b/o3d/build/all.gyp
@@ -4,7 +4,6 @@
 
 {
   'includes': [
-    '../../build/common.gypi',
     'common.gypi',
   ],
   'targets': [
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 5dc0538..aa9ffe5 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'variables': {
     'antlrdir': 'third_party/antlr3',
     'breakpaddir': 'breakpad/src',
diff --git a/o3d/build/gyp_o3d b/o3d/build/gyp_o3d
new file mode 100644
index 0000000..2603b29e
--- /dev/null
+++ b/o3d/build/gyp_o3d
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+# This script is wrapper for O3D when compiling independently of chromium. 
+# Like in chromium, the gyp_chromium.gypi include is forced in. 
+
+import glob
+import os
+import shlex
+import sys
+
+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:]
+
+  # Always include gyp_chromium.gypi
+  args += ['-I', os.path.join(os.path.dirname(sys.argv[0]),'../../build/gyp_chromium.gypi')]
+
+  # Off we go...
+  sys.exit(gyp.main(args))
diff --git a/printing/printing.gyp b/printing/printing.gyp
index d1a7d85..9ac38ca 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'printing',
diff --git a/rlz/rlz.gyp b/rlz/rlz.gyp
index fd079a2..1dad562 100644
--- a/rlz/rlz.gyp
+++ b/rlz/rlz.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'conditions': [
     [ 'OS == "win"', {
       'targets': [
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 5d5ebc5..be46f55 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'conditions': [
     [ 'OS=="linux" and selinux==0', {
       'targets': [
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp
index b8224a3..ef2d5a2 100644
--- a/sdch/sdch.gyp
+++ b/sdch/sdch.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'sdch',
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 833235f..9bec849 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'skia',
diff --git a/testing/gmock.gyp b/testing/gmock.gyp
index aa84be8..5a2a5fd 100644
--- a/testing/gmock.gyp
+++ b/testing/gmock.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'gmock',
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 6d45e9a..f89d6e5c 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'gtest',
diff --git a/third_party/bsdiff/bsdiff.gyp b/third_party/bsdiff/bsdiff.gyp
index 774189e..2d1563f 100644
--- a/third_party/bsdiff/bsdiff.gyp
+++ b/third_party/bsdiff/bsdiff.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'bsdiff',
diff --git a/third_party/bspatch/bspatch.gyp b/third_party/bspatch/bspatch.gyp
index 6f51cef..e45d47f 100644
--- a/third_party/bspatch/bspatch.gyp
+++ b/third_party/bspatch/bspatch.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'bspatch',
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index dd493b0..29b014f 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'variables': {
     'use_system_bzip2%': 0,
   },
diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp
index 9f47d76..3007aff 100644
--- a/third_party/cld/cld.gyp
+++ b/third_party/cld/cld.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
diff --git a/third_party/codesighs/codesighs.gyp b/third_party/codesighs/codesighs.gyp
index c3874f8..2e1babe 100644
--- a/third_party/codesighs/codesighs.gyp
+++ b/third_party/codesighs/codesighs.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'codesighs',
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index f118075..76538b7 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'target_defaults': {
     'conditions': [
       ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}],
diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp
index b19680a..1e3296f 100644
--- a/third_party/harfbuzz/harfbuzz.gyp
+++ b/third_party/harfbuzz/harfbuzz.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'harfbuzz',
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index 352fb32..a6ec032 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'libevent',
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index 64455b0..01aea5c 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'variables': {
     'use_system_libjpeg%': 0,
   },
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index 3ea279c..e9ab28c 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'variables': {
     'use_system_libpng%': 0,
   },
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index ed16e58..cd6d85f 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -11,9 +11,6 @@
     ],
     'use_system_libxml%': 0,
   },
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'libxml',
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index 61bf795..3b0020e 100644
--- a/third_party/libxslt/libxslt.gyp
+++ b/third_party/libxslt/libxslt.gyp
@@ -11,9 +11,6 @@
     ],
     'use_system_libxslt%': 0,
   },
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'libxslt',
diff --git a/third_party/lzma_sdk/lzma_sdk.gyp b/third_party/lzma_sdk/lzma_sdk.gyp
index 3efe5ff..1b34dda 100644
--- a/third_party/lzma_sdk/lzma_sdk.gyp
+++ b/third_party/lzma_sdk/lzma_sdk.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'lzma_sdk',
diff --git a/third_party/modp_b64/modp_b64.gyp b/third_party/modp_b64/modp_b64.gyp
index 18dadd8..ac57601 100644
--- a/third_party/modp_b64/modp_b64.gyp
+++ b/third_party/modp_b64/modp_b64.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'modp_b64',
diff --git a/third_party/npapi/npapi.gyp b/third_party/npapi/npapi.gyp
index 20b1b62..712ad27 100644
--- a/third_party/npapi/npapi.gyp
+++ b/third_party/npapi/npapi.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'npapi',
diff --git a/third_party/protobuf2/protobuf.gyp b/third_party/protobuf2/protobuf.gyp
index 4e3519b..b6fe48a 100644
--- a/third_party/protobuf2/protobuf.gyp
+++ b/third_party/protobuf2/protobuf.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'conditions': [
     ['OS!="win"', {
       'variables': {
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index cd1af20..44ffbab 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -7,9 +7,6 @@
     'use_system_sqlite%': 0,
     'required_sqlite_version': '3.6.1',
   },
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'target_defaults': {
     'defines': [
       'SQLITE_ENABLE_FTS2',
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index d3fdb39..8a11bf6 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'tcmalloc',
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 922676d..e9a8e37 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'variables': {
     'use_system_zlib%': 0,
   },
diff --git a/tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp b/tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp
index f4f8da4..2112108 100644
--- a/tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp
+++ b/tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp
@@ -1,7 +1,4 @@
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'gtk_clipboard_dump',
diff --git a/tools/imagediff/image_diff.gyp b/tools/imagediff/image_diff.gyp
index 0448f7c..eb2518c 100644
--- a/tools/imagediff/image_diff.gyp
+++ b/tools/imagediff/image_diff.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets' : [ 
     {
       'target_name': 'image_diff',
diff --git a/tools/memory_watcher/memory_watcher.gyp b/tools/memory_watcher/memory_watcher.gyp
index 995affa..50b003b 100644
--- a/tools/memory_watcher/memory_watcher.gyp
+++ b/tools/memory_watcher/memory_watcher.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'memory_watcher',
diff --git a/tools/xdisplaycheck/xdisplaycheck.gyp b/tools/xdisplaycheck/xdisplaycheck.gyp
index cb22c22..2392049 100644
--- a/tools/xdisplaycheck/xdisplaycheck.gyp
+++ b/tools/xdisplaycheck/xdisplaycheck.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'xdisplaycheck',
diff --git a/views/views.gyp b/views/views.gyp
index bbcade4..aa36238 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    '../build/common.gypi',
-  ],
   'target_defaults': {
     'sources/': [
       ['exclude', '/(cocoa|gtk|win)/'],
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index 06e9095..351ee61 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
   'targets': [
   ],
   'conditions': [
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index e13a744..50adab9 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -21,9 +21,6 @@
       'resource.h',
     ],
   },
-  'includes': [
-    '../../../build/common.gypi',
-  ],
   'targets': [
     {
       'target_name': 'test_shell_common',
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index d149f8f..1f95d93 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -164,7 +164,6 @@
     ],
   },
   'includes': [
-    '../build/common.gypi',
     '../third_party/WebKit/JavaScriptCore/JavaScriptCore.gypi',
     '../third_party/WebKit/WebCore/WebCore.gypi',
   ],