diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 04:42:01 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 04:42:01 +0000 |
| commit | 2d2f60d7cd589849d057060d22d9e569bf3be1dd (patch) | |
| tree | c221a29a6c31d733f6036846f149d2668535e1c5 /content/content_shell.gypi | |
| parent | 8028a89b2c6ff119c062c6532387e7d2e825dec8 (diff) | |
| download | chromium_src-2d2f60d7cd589849d057060d22d9e569bf3be1dd.zip chromium_src-2d2f60d7cd589849d057060d22d9e569bf3be1dd.tar.gz chromium_src-2d2f60d7cd589849d057060d22d9e569bf3be1dd.tar.bz2 | |
chromeos: Separate ash dependency from chromeos.
BUG=none
R=jam@chromium.org
Review URL: https://codereview.chromium.org/14646017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 8d3e868..901e9fd 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -216,10 +216,14 @@ }], # use_aura==1 ['chromeos==1', { 'dependencies': [ - '../ash/ash.gyp:ash', '../chromeos/chromeos.gyp:chromeos', ], }], # chromeos==1 + ['use_ash==1', { + 'dependencies': [ + '../ash/ash.gyp:ash', + ], + }], ['use_custom_freetype==1', { 'dependencies': [ '../third_party/freetype2/freetype2.gyp:freetype2', |