summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorcmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-01 17:22:13 +0000
committercmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-01 17:22:13 +0000
commit32bb8540347359ac40ac53e06089cbdc1db0a532 (patch)
tree24223bd669eea4558a4d612e358c102754a61e83 /chrome/chrome_common.gypi
parent7a751e6107c160ec326c88d10193589459cef3f7 (diff)
downloadchromium_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/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi6
1 files changed, 3 insertions, 3 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',
],