summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-06 20:49:01 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-06 20:49:01 +0000
commit118b102648c8d1baf76150f965154e7b718ed816 (patch)
tree5c1b5ea13c6dacba6cf6e61ae12f6aa5fe81da47
parent336629d65673b156acf7217d1d2240e31ed43185 (diff)
downloadchromium_src-118b102648c8d1baf76150f965154e7b718ed816.zip
chromium_src-118b102648c8d1baf76150f965154e7b718ed816.tar.gz
chromium_src-118b102648c8d1baf76150f965154e7b718ed816.tar.bz2
Change all the references from app_base to sql.
BUG=72317 TEST=None R=tony@chromium.org Review URL: http://codereview.chromium.org/7232040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91600 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_common.gypi3
-rw-r--r--chrome/chrome_tests.gypi5
-rw-r--r--webkit/appcache/webkit_appcache.gypi2
-rw-r--r--webkit/blob/webkit_blob.gypi1
-rw-r--r--webkit/database/webkit_database.gypi2
-rw-r--r--webkit/fileapi/webkit_fileapi.gypi1
-rw-r--r--webkit/glue/webkit_glue.gypi1
-rw-r--r--webkit/quota/webkit_quota.gypi2
-rw-r--r--webkit/tools/test_shell/test_shell.gypi1
9 files changed, 3 insertions, 15 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index ec422a9..2b26917 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -113,7 +113,6 @@
'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',
@@ -345,7 +344,6 @@
}],
],
'export_dependent_settings': [
- '../app/app.gyp:app_base',
'../base/base.gyp:base',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'safe_browsing_csd_proto',
@@ -382,7 +380,6 @@
'dependencies': [
'chrome_resources',
'chrome_strings',
- '../app/app.gyp:app_base',
'../base/base.gyp:base',
'../crypto/crypto.gyp:crypto',
'../gpu/gpu.gyp:gpu_ipc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fdf19ae..0cb796c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -628,7 +628,6 @@
'chrome_strings',
'profile_import',
'test_support_ui',
- '../app/app.gyp:app_base',
'../base/base.gyp:base',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
@@ -2288,7 +2287,6 @@
'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',
@@ -2831,7 +2829,6 @@
'chrome_resources',
'chrome_strings',
'test_support_ui',
- '../app/app.gyp:app_base',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
@@ -3524,7 +3521,6 @@
'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',
@@ -3696,7 +3692,6 @@
'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',
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index 6529dfb..2ae80d9 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 5870cde..918dfb0 100644
--- a/webkit/blob/webkit_blob.gypi
+++ b/webkit/blob/webkit_blob.gypi
@@ -8,7 +8,6 @@
'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 ae22832..91589a6 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 86e95a21..ab1ad84 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -8,7 +8,6 @@
'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 e0720c4..b8b8c88 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -61,7 +61,6 @@
'target_name': 'webkit_user_agent',
'type': 'static_library',
'dependencies': [
- '<(DEPTH)/app/app.gyp:app_base',
'<(DEPTH)/base/base.gyp:base_i18n',
],
'actions': [
diff --git a/webkit/quota/webkit_quota.gypi b/webkit/quota/webkit_quota.gypi
index fa92abe..9a665d6 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 c96b22e..d6b335f 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -28,7 +28,6 @@
'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',