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-18 09:09:04 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 09:09:04 +0000
commitbcded8d54cc4b84af71fcf56fbfccfe3820bff6c (patch)
tree50559292f11063dbed82154897c2328ce4cb9455 /content/content_common.gypi
parent5538085e6d622f4c7b684597f697fd69be513489 (diff)
downloadchromium_src-bcded8d54cc4b84af71fcf56fbfccfe3820bff6c.zip
chromium_src-bcded8d54cc4b84af71fcf56fbfccfe3820bff6c.tar.gz
chromium_src-bcded8d54cc4b84af71fcf56fbfccfe3820bff6c.tar.bz2
webkit: Merge blob and fileapi into one build target 'webkit_storage'
Replace build targets 'blob' and 'fileapi' with newly introduced 'webkit_storage' Introduce a new directory webkit/storage to host webkit_storage.gypi and webkit_storage_export.h Replace BLOB_EXPORT and FILEAPI_EXPORT with WEBKIT_STORAGE_EXPORT BUG=155242 TEST=build TBR=darin@chromium.org, piman@chromium.org Review URL: https://chromiumcodereview.appspot.com/11103031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
-rw-r--r--content/content_common.gypi3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index d49b89f..02cfc46 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -417,10 +417,9 @@
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gl/gl.gyp:gl',
'../webkit/support/webkit_support.gyp:appcache',
- '../webkit/support/webkit_support.gyp:blob',
'../webkit/support/webkit_support.gyp:database',
- '../webkit/support/webkit_support.gyp:fileapi',
'../webkit/support/webkit_support.gyp:webkit_base',
+ '../webkit/support/webkit_support.gyp:webkit_storage',
],
}],
['OS!="win"', {