Chromium Code Reviews| Index: webkit/support/webkit_support.gyp |
| diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp |
| index 4ea374ef9cecf69e456dd4e9c4f28a94bcada606..2a3bb4993b05ebb07843014111d3d15130dad137 100644 |
| --- a/webkit/support/webkit_support.gyp |
| +++ b/webkit/support/webkit_support.gyp |
| @@ -4,19 +4,28 @@ |
| { |
| 'includes': [ |
| - '../../build/win_precompile.gypi', |
| - '../appcache/webkit_appcache.gypi', |
| - '../base/webkit_base.gypi', |
| - '../blob/webkit_blob.gypi', |
| - '../database/webkit_database.gypi', |
| - '../dom_storage/webkit_dom_storage.gypi', |
| - '../fileapi/webkit_fileapi.gypi', |
| - '../forms/webkit_forms.gypi', |
| - '../glue/webkit_glue.gypi', |
| - '../gpu/webkit_gpu.gypi', |
| - '../media/webkit_media.gypi', |
| - '../quota/webkit_quota.gypi', |
| '../user_agent/webkit_user_agent.gypi', |
| - 'webkit_support.gypi', |
| + ], |
| + 'conditions': [ |
| + # TODO(stuartmorgan): All dependencies from code built on iOS to |
| + # webkit/ should be removed, at which point this condition can be |
| + # removed. |
|
tony
2012/09/10 17:15:17
Is it problematic to include the gypi files but no
stuartmorgan
2012/09/11 09:42:54
Yes. Project file generation is per gyp file, not
|
| + ['OS != "ios"', { |
| + 'includes': [ |
| + '../../build/win_precompile.gypi', |
| + '../appcache/webkit_appcache.gypi', |
| + '../base/webkit_base.gypi', |
| + '../blob/webkit_blob.gypi', |
| + '../database/webkit_database.gypi', |
| + '../dom_storage/webkit_dom_storage.gypi', |
| + '../fileapi/webkit_fileapi.gypi', |
| + '../forms/webkit_forms.gypi', |
| + '../glue/webkit_glue.gypi', |
| + '../gpu/webkit_gpu.gypi', |
| + '../media/webkit_media.gypi', |
| + '../quota/webkit_quota.gypi', |
| + 'webkit_support.gypi', |
| + ], |
| + }], |
| ], |
| } |