diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 23:01:11 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 23:01:11 +0000 |
| commit | 81cbbeba77b50e09cf52c7da09ed5ff88056cd28 (patch) | |
| tree | 23f22422567e17b98d038d1d767bc79f51d78b77 | |
| parent | 6085c70d3d597116492a31930402f2f6e3975ab2 (diff) | |
| download | chromium_src-81cbbeba77b50e09cf52c7da09ed5ff88056cd28.zip chromium_src-81cbbeba77b50e09cf52c7da09ed5ff88056cd28.tar.gz chromium_src-81cbbeba77b50e09cf52c7da09ed5ff88056cd28.tar.bz2 | |
Have ui.gyp no longer depend on chrome.gyp in a webkit build.
In r78711, a dependency was added (well, moved from views.gyp)
from ui.gyp to chrome.gyp. Make this dependency optional since
we don't need to build ui_unittests in a webkit only checkout.
Ideally, ui.gyp shouldn't depend on chrome.gyp, but I'm punting
that for now. I filed http://crbug.com/77100 for this.
Review URL: http://codereview.chromium.org/6725013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79064 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/ui.gyp | 6 | ||||
| -rw-r--r-- | ui/ui_gfx.gypi | 8 |
2 files changed, 11 insertions, 3 deletions
@@ -50,7 +50,6 @@ 'includes': [ 'ui_base.gypi', 'ui_gfx.gypi', - 'ui_unittests.gypi', ], 'conditions': [ ['toolkit_views2==1', { @@ -58,6 +57,11 @@ 'ui_views.gypi', ], }], + ['inside_chromium_build==1', { + 'includes': [ + 'ui_unittests.gypi', + ], + }], ], } diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi index d3c36d3..9931f40 100644 --- a/ui/ui_gfx.gypi +++ b/ui/ui_gfx.gypi @@ -16,8 +16,12 @@ 'target_name': 'gfx_unittests', 'type': 'none', 'msvs_guid': '1D386FA9-2501-41E2-8FE8-527DAF479CE6', - 'dependencies': [ - 'ui_unittests', + 'conditions': [ + ['inside_chromium_build==1', { + 'dependencies': [ + 'ui_unittests', + ], + }], ], 'actions': [ { |