diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 14:23:48 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 14:23:48 +0000 |
| commit | 3727aebfa4a0fe3d9cea2ad7b117ab1a115d7efb (patch) | |
| tree | 07bca2d066ffe49c14dec8c0b188814daca7cba5 /build | |
| parent | 2777d4863f1d4369f03d9e80da5f0858d6f94669 (diff) | |
| download | chromium_src-3727aebfa4a0fe3d9cea2ad7b117ab1a115d7efb.zip chromium_src-3727aebfa4a0fe3d9cea2ad7b117ab1a115d7efb.tar.gz chromium_src-3727aebfa4a0fe3d9cea2ad7b117ab1a115d7efb.tar.bz2 | |
Enable more targets for iOS in all.gyp
All these targets have come online for iOS, and build successfully.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10832006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index 8f221bf0..086cb05 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -11,9 +11,12 @@ 'dependencies': [ 'some.gyp:*', '../base/base.gyp:*', + '../sql/sql.gyp:*', '../testing/gtest.gyp:*', + '../third_party/bzip2/bzip2.gyp:*', '../third_party/icu/icu.gyp:*', '../third_party/libxml/libxml.gyp:*', + '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', 'temp_gyp/googleurl.gyp:*', # Add new dependencies to the !ios section just below, not here (see @@ -40,10 +43,8 @@ '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', - '../sql/sql.gyp:*', '../sync/sync.gyp:*', '../testing/gmock.gyp:*', - '../third_party/bzip2/bzip2.gyp:*', '../third_party/cacheinvalidation/cacheinvalidation.gyp:*', '../third_party/cld/cld.gyp:*', '../third_party/codesighs/codesighs.gyp:*', @@ -59,7 +60,6 @@ '../third_party/npapi/npapi.gyp:*', '../third_party/ots/ots.gyp:*', '../third_party/qcms/qcms.gyp:*', - '../third_party/sqlite/sqlite.gyp:*', '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtools_zip', '../v8/tools/gyp/v8.gyp:*', @@ -199,6 +199,8 @@ 'target_name': 'chromium_builder_tests', 'type': 'none', 'dependencies': [ + '../base/base.gyp:base_unittests', + '../sql/sql.gyp:sql_unittests', # Add new dependencies to the !ios section just below, not here (see # the comment there). ], @@ -208,7 +210,6 @@ # TODO(ios): This is temporary; currently almost nothing builds with # OS=ios. Move dependencies back to the main dependencies section # above as gyp files come online. - '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:safe_browsing_tests', @@ -227,7 +228,6 @@ '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', - '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', |