From 21642abd8a9957b2b86380419dfbfdeae479dcc7 Mon Sep 17 00:00:00 2001 From: "yaar@chromium.org" Date: Tue, 15 Sep 2009 23:52:14 +0000 Subject: 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 --- app/app.gyp | 3 --- 1 file changed, 3 deletions(-) (limited to 'app') 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)/'], -- cgit v1.1