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

19 files changed, 0 insertions, 57 deletions

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,
   },