diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 19:10:40 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 19:10:40 +0000 |
| commit | e34dcdafdf248f6388bf7a238f6f91c2b07b2d8f (patch) | |
| tree | 9a60b5dfadf255fda09540535be99436933504cf /build/all.gyp | |
| parent | 4b287e489c54c8084a7dd4f36ba9c5f16d62d3ff (diff) | |
| download | chromium_src-e34dcdafdf248f6388bf7a238f6f91c2b07b2d8f.zip chromium_src-e34dcdafdf248f6388bf7a238f6f91c2b07b2d8f.tar.gz chromium_src-e34dcdafdf248f6388bf7a238f6f91c2b07b2d8f.tar.bz2 | |
Move all_webkit inside OS!="ios" block in all.gyp
TBR=abarth@chromium.org
Review URL: https://codereview.chromium.org/15054005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build/all.gyp b/build/all.gyp index 264ede7..07c3f95 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -186,14 +186,6 @@ ], }, # target_name: All { - 'target_name': 'all_webkit', - 'type': 'none', - 'dependencies': [ - '../third_party/WebKit/public/all.gyp:all_blink', - '../content/content.gyp:content_shell', - ], - }, # target_name: all_webkit - { 'target_name': 'All_syzygy', 'type': 'none', 'conditions': [ @@ -321,6 +313,14 @@ ['OS!="ios"', { 'targets': [ { + 'target_name': 'all_webkit', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/public/all.gyp:all_blink', + '../content/content.gyp:content_shell', + ], + }, # target_name: all_webkit + { 'target_name': 'chromium_builder_nacl_win_integration', 'type': 'none', 'dependencies': [ |