diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 17:22:13 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 17:22:13 +0000 |
| commit | 32bb8540347359ac40ac53e06089cbdc1db0a532 (patch) | |
| tree | 24223bd669eea4558a4d612e358c102754a61e83 /chrome | |
| parent | 7a751e6107c160ec326c88d10193589459cef3f7 (diff) | |
| download | chromium_src-32bb8540347359ac40ac53e06089cbdc1db0a532.zip chromium_src-32bb8540347359ac40ac53e06089cbdc1db0a532.tar.gz chromium_src-32bb8540347359ac40ac53e06089cbdc1db0a532.tar.bz2 | |
Revert 91288 - Change references from app_base to sql.
BUG=72317
TEST=None
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/7256004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_common.gypi | 6 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index dd48462..ec422a9 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -113,6 +113,7 @@ 'safe_browsing_proto', 'theme_resources', 'theme_resources_standard', + '../app/app.gyp:app_base', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:base_static', @@ -122,7 +123,6 @@ '../net/net.gyp:net', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', '../third_party/bzip2/bzip2.gyp:bzip2', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', @@ -345,8 +345,8 @@ }], ], 'export_dependent_settings': [ + '../app/app.gyp:app_base', '../base/base.gyp:base', - '../sql/sql.gyp:sql', '../third_party/protobuf/protobuf.gyp:protobuf_lite', 'safe_browsing_csd_proto', 'safe_browsing_proto', @@ -382,12 +382,12 @@ 'dependencies': [ 'chrome_resources', 'chrome_strings', + '../app/app.gyp:app_base', '../base/base.gyp:base', '../crypto/crypto.gyp:crypto', '../gpu/gpu.gyp:gpu_ipc', '../net/net.gyp:net_resources', '../net/net.gyp:net', - '../sql/sql.gyp:sql', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 5cd4182..cdebadf 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -628,12 +628,12 @@ 'chrome_strings', 'profile_import', 'test_support_ui', + '../app/app.gyp:app_base', '../base/base.gyp:base', - '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../net/net.gyp:net_test_support', + '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', @@ -2282,13 +2282,13 @@ 'profile_import', 'renderer', 'test_support_common', + '../app/app.gyp:app_base', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cld/cld.gyp:cld', @@ -2800,9 +2800,9 @@ 'chrome_resources', 'chrome_strings', 'test_support_ui', + '../app/app.gyp:app_base', '../base/base.gyp:base', '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', '../testing/gtest.gyp:gtest', ], 'sources': [ @@ -3493,11 +3493,11 @@ 'chrome_strings', 'renderer', 'test_support_common', + '../app/app.gyp:app_base', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', @@ -3665,12 +3665,12 @@ 'renderer', 'chrome_resources', 'chrome_strings', + '../app/app.gyp:app_base', + '../content/content.gyp:content_gpu', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', - '../content/content.gyp:content_gpu', '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', '../testing/gtest.gyp:gtest', '../webkit/support/webkit_support.gyp:glue', ], |