summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 23:52:14 +0000
committeryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 23:52:14 +0000
commit21642abd8a9957b2b86380419dfbfdeae479dcc7 (patch)
tree59720a3453814c8d334b78ca3b44d7ae28e31e03 /chrome
parentcd05e24cfc1f743ef37a050a35be367590ccd587 (diff)
downloadchromium_src-21642abd8a9957b2b86380419dfbfdeae479dcc7.zip
chromium_src-21642abd8a9957b2b86380419dfbfdeae479dcc7.tar.gz
chromium_src-21642abd8a9957b2b86380419dfbfdeae479dcc7.tar.bz2
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
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/locales/locales.gyp3
-rw-r--r--chrome/chrome.gyp3
-rw-r--r--chrome/installer/installer.gyp3
-rwxr-xr-xchrome/installer/mini_installer.gyp3
-rw-r--r--chrome/test/security_tests/security_tests.gyp3
5 files changed, 0 insertions, 15 deletions
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',