summaryrefslogtreecommitdiffstats
path: root/content/content_common.gypi
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-26 13:13:53 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-26 13:13:53 +0000
commit8eadc8bbf1f3c89b494150b32109e14c1ef964db (patch)
treef6a48b136b99318e1b30da612c36e6084851b94e /content/content_common.gypi
parent8540c5f3aaf61f18b41cf5304f5174c7a3ebd7af (diff)
downloadchromium_src-8eadc8bbf1f3c89b494150b32109e14c1ef964db.zip
chromium_src-8eadc8bbf1f3c89b494150b32109e14c1ef964db.tar.gz
chromium_src-8eadc8bbf1f3c89b494150b32109e14c1ef964db.tar.bz2
webkit: Merge 'database' and 'quota' to 'webkit_storage'
Remove webkit/database/quota_table* since it's not used. Merge 'database' and 'quota' to 'webkit_storage'. Add WEBKIT_STORAGE_EXPORT(_PRIVATE) when necessary. BUG=155242 TEST=build TBR=jam@chromium.org for trivial gyp changes Review URL: https://chromiumcodereview.appspot.com/11274003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
-rw-r--r--content/content_common.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 5185f49..a4a6791 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -414,7 +414,6 @@
'../third_party/npapi/npapi.gyp:npapi',
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gl/gl.gyp:gl',
- '../webkit/support/webkit_support.gyp:database',
'../webkit/support/webkit_support.gyp:webkit_base',
'../webkit/support/webkit_support.gyp:webkit_storage',
],