Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: webkit/storage/webkit_storage.gypi

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyps, fix ios Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | webkit/support/setup_third_party.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)',
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | webkit/support/setup_third_party.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698