Index: webkit/storage/webkit_storage.gypi |
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi |
index f39de1d4edd515d94566db88f7e8db99c305488c..a84192c0befd1f414e9bb892b181e113f475e0a0 100644 |
--- a/webkit/storage/webkit_storage.gypi |
+++ b/webkit/storage/webkit_storage.gypi |
@@ -3,15 +3,6 @@ |
# found in the LICENSE file. |
{ |
- 'variables': { |
- 'conditions': [ |
- ['inside_chromium_build==0', { |
- 'webkit_src_dir': '../../../../..', |
- },{ |
- 'webkit_src_dir': '../../third_party/WebKit', |
- }], |
- ], |
- }, |
'includes': [ |
'../appcache/webkit_appcache.gypi', |
'../blob/webkit_blob.gypi', |
@@ -32,10 +23,10 @@ |
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', |
'<(DEPTH)/net/net.gyp:net', |
'<(DEPTH)/sql/sql.gyp:sql', |
+ '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
'<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
'<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', |
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', |
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', |
], |
'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], |
'sources': [ |
@@ -48,11 +39,6 @@ |
'<@(webkit_quota_sources)', |
], |
'conditions': [ |
- ['inside_chromium_build==0', { |
- 'dependencies': [ |
- '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', |
- ], |
- }], |
['chromeos==1', { |
'sources': [ |
'<@(webkit_fileapi_chromeos_sources)', |