diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 19:50:37 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 19:50:37 +0000 |
| commit | 54ac11b32b4ed6365204a475a1d1466e1c06b3e9 (patch) | |
| tree | 72343a792bf8afd5c7f25b28b0a7068e1b2079ca /build/all.gyp | |
| parent | 368b437271e06ddaf296728f9a5cc72c7d8b3273 (diff) | |
| download | chromium_src-54ac11b32b4ed6365204a475a1d1466e1c06b3e9.zip chromium_src-54ac11b32b4ed6365204a475a1d1466e1c06b3e9.tar.gz chromium_src-54ac11b32b4ed6365204a475a1d1466e1c06b3e9.tar.bz2 | |
Build components.gyp:* and components_test.gyp:* on iOS.
These targets are now built as part of the All build on iOS.
BUG=324837,324839
Review URL: https://codereview.chromium.org/101503002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/all.gyp b/build/all.gyp index edb2e86..5aaed3d 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -12,6 +12,8 @@ 'some.gyp:*', '../base/base.gyp:*', '../chrome/chrome.gyp:*', + '../components/components.gyp:*', + '../components/components_tests.gyp:*', '../content/content.gyp:*', '../content/content_shell_and_tests.gyp:*', '../crypto/crypto.gyp:*', @@ -34,8 +36,6 @@ ['OS!="ios"', { 'dependencies': [ '../cc/cc_tests.gyp:*', - '../components/components.gyp:*', - '../components/components_tests.gyp:*', '../device/bluetooth/bluetooth.gyp:*', '../device/device_tests.gyp:*', '../device/usb/usb.gyp:*', @@ -226,9 +226,11 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_unittests', + '../components/components_tests.gyp:components_unittests', '../crypto/crypto.gyp:crypto_unittests', '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', + '../sync/sync.gyp:sync_unit_tests', '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', ], @@ -245,7 +247,6 @@ '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', - '../components/components_tests.gyp:components_unittests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_shell', '../content/content_shell_and_tests.gyp:content_unittests', @@ -260,7 +261,6 @@ '../mojo/mojo.gyp:mojo', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../sync/sync.gyp:sync_unit_tests', '../third_party/WebKit/public/all.gyp:all_blink', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', |