diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 13:13:53 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 13:13:53 +0000 |
| commit | 8eadc8bbf1f3c89b494150b32109e14c1ef964db (patch) | |
| tree | f6a48b136b99318e1b30da612c36e6084851b94e /webkit/storage | |
| parent | 8540c5f3aaf61f18b41cf5304f5174c7a3ebd7af (diff) | |
| download | chromium_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 'webkit/storage')
| -rw-r--r-- | webkit/storage/webkit_storage.gypi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi index e38ffc7..344a2f1 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -15,8 +15,10 @@ 'includes': [ '../appcache/webkit_appcache.gypi', '../blob/webkit_blob.gypi', + '../database/webkit_database.gypi', '../dom_storage/webkit_dom_storage.gypi', '../fileapi/webkit_fileapi.gypi', + '../quota/webkit_quota.gypi', ], 'targets': [ { @@ -32,19 +34,18 @@ '<(DEPTH)/sql/sql.gyp:sql', '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', - '<(DEPTH)/webkit/support/webkit_support.gyp:database', - '<(DEPTH)/webkit/support/webkit_support.gyp:quota', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], 'sources': [ - # TODO(hashimoto): Import all storage related modules. crbug.com/155242 '../storage/webkit_storage_export.h', '<@(webkit_appcache_sources)', '<@(webkit_blob_sources)', + '<@(webkit_database_sources)', '<@(webkit_dom_storage_sources)', '<@(webkit_fileapi_sources)', + '<@(webkit_quota_sources)', ], 'conditions': [ ['inside_chromium_build==0', { |