Index: build/all.gyp |
diff --git a/build/all.gyp b/build/all.gyp |
index 8f221bf0b2c10f23779666877993de2c1848b8c3..086cb05a782cb80aff22cfa34203c5a8880e447d 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', |