From 32bb8540347359ac40ac53e06089cbdc1db0a532 Mon Sep 17 00:00:00 2001 From: "cmp@chromium.org" Date: Fri, 1 Jul 2011 17:22:13 +0000 Subject: 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 --- chrome/chrome_common.gypi | 6 +++--- chrome/chrome_tests.gypi | 14 +++++++------- webkit/appcache/webkit_appcache.gypi | 2 +- webkit/blob/webkit_blob.gypi | 1 + webkit/database/webkit_database.gypi | 2 +- webkit/fileapi/webkit_fileapi.gypi | 1 + webkit/glue/webkit_glue.gypi | 2 ++ webkit/quota/webkit_quota.gypi | 2 +- webkit/tools/test_shell/test_shell.gypi | 1 + 9 files changed, 18 insertions(+), 13 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', ], diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi index 2ae80d9..6529dfb 100644 --- a/webkit/appcache/webkit_appcache.gypi +++ b/webkit/appcache/webkit_appcache.gypi @@ -8,8 +8,8 @@ 'target_name': 'appcache', 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/net/net.gyp:net', - '<(DEPTH)/sql/sql.gyp:sql', ], 'sources': [ # This list contains all .h and .cc in appcache except for test code. diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi index 918dfb0..5870cde 100644 --- a/webkit/blob/webkit_blob.gypi +++ b/webkit/blob/webkit_blob.gypi @@ -8,6 +8,7 @@ 'target_name': 'blob', 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/net/net.gyp:net', ], diff --git a/webkit/database/webkit_database.gypi b/webkit/database/webkit_database.gypi index 91589a6..ae22832 100644 --- a/webkit/database/webkit_database.gypi +++ b/webkit/database/webkit_database.gypi @@ -8,8 +8,8 @@ 'target_name': 'database', 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/sql/sql.gyp:sql', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', '<(DEPTH)/webkit/support/webkit_support.gyp:quota', ], diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi index ab1ad84..86e95a21 100644 --- a/webkit/fileapi/webkit_fileapi.gypi +++ b/webkit/fileapi/webkit_fileapi.gypi @@ -8,6 +8,7 @@ 'target_name': 'fileapi', 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/third_party/leveldb/leveldb.gyp:leveldb', diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 031384c..a0942c6 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -61,6 +61,7 @@ 'target_name': 'webkit_user_agent', 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base_i18n', ], 'actions': [ @@ -103,6 +104,7 @@ 'target_name': 'glue', 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/net/net.gyp:net', diff --git a/webkit/quota/webkit_quota.gypi b/webkit/quota/webkit_quota.gypi index 9a665d6..fa92abe 100644 --- a/webkit/quota/webkit_quota.gypi +++ b/webkit/quota/webkit_quota.gypi @@ -8,9 +8,9 @@ 'target_name': 'quota', 'type': 'static_library', 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/net/net.gyp:net', - '<(DEPTH)/sql/sql.gyp:sql', ], 'sources': [ 'quota_client.h', diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index d6b335f..c96b22e 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -28,6 +28,7 @@ 'chromium_code': 1, }, 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', -- cgit v1.1