summaryrefslogtreecommitdiffstats
path: root/webkit/storage
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-23 04:18:40 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-23 04:18:40 +0000
commit4cea3540e5b0c9910eaa94991c30255dc1fcc8de (patch)
tree08b2577bf225bc9deebe3952ddbd43bf07208006 /webkit/storage
parentd2be53c910edad54684d5af6b62a05c488643fbc (diff)
downloadchromium_src-4cea3540e5b0c9910eaa94991c30255dc1fcc8de.zip
chromium_src-4cea3540e5b0c9910eaa94991c30255dc1fcc8de.tar.gz
chromium_src-4cea3540e5b0c9910eaa94991c30255dc1fcc8de.tar.bz2
webkit: Merge build target 'appcache' to 'webkit_storage'
BUG=155242 TEST=build TBR=darin@chromium.org for trivial gyp changes Review URL: https://chromiumcodereview.appspot.com/11230022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/storage')
-rw-r--r--webkit/storage/webkit_storage.gypi3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index ae26150..1896312 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -13,6 +13,7 @@
],
},
'includes': [
+ '../appcache/webkit_appcache.gypi',
'../blob/webkit_blob.gypi',
'../fileapi/webkit_fileapi.gypi',
],
@@ -27,6 +28,7 @@
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/net/net.gyp:net',
+ '<(DEPTH)/sql/sql.gyp:sql',
'<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'<(DEPTH)/webkit/support/webkit_support.gyp:quota',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
@@ -36,6 +38,7 @@
'sources': [
# TODO(hashimoto): Import all storage related modules. crbug.com/155242
'../storage/webkit_storage_export.h',
+ '<@(webkit_appcache_sources)',
'<@(webkit_blob_sources)',
'<@(webkit_fileapi_sources)',
],