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

Side by Side Diff: webkit/storage/webkit_storage.gypi

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/webkit_plugins.gypi ('k') | win8/metro_driver/metro_driver.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../appcache/webkit_appcache.gypi', 7 '../appcache/webkit_appcache.gypi',
8 '../dom_storage/webkit_dom_storage.gypi', 8 '../dom_storage/webkit_dom_storage.gypi',
9 9
10 # TODO(kinuko): Deprecate this when we have a new target for 10 # TODO(kinuko): Deprecate this when we have a new target for
11 # webkit_browser. crbug.com/239710 11 # webkit_browser. crbug.com/239710
12 '../browser/webkit_browser.gypi', 12 '../browser/webkit_browser.gypi',
13 '../common/webkit_common.gypi', 13 '../common/webkit_common.gypi',
14 ], 14 ],
15 'targets': [ 15 'targets': [
16 { 16 {
17 'target_name': 'webkit_storage', 17 'target_name': 'webkit_storage',
18 'type': '<(component)', 18 'type': '<(component)',
19 'variables': { 'enable_wexit_time_destructors': 1, }, 19 'variables': { 'enable_wexit_time_destructors': 1, },
20 'dependencies': [ 20 'dependencies': [
21 '<(DEPTH)/base/base.gyp:base', 21 '<(DEPTH)/base/base.gyp:base',
22 '<(DEPTH)/base/base.gyp:base_i18n', 22 '<(DEPTH)/base/base.gyp:base_i18n',
23 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 23 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
24 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
25 '<(DEPTH)/net/net.gyp:net', 24 '<(DEPTH)/net/net.gyp:net',
26 '<(DEPTH)/sql/sql.gyp:sql', 25 '<(DEPTH)/sql/sql.gyp:sql',
27 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 26 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
28 '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 27 '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
29 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 28 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
29 '<(DEPTH)/url/url.gyp:url_lib',
30 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', 30 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
31 ], 31 ],
32 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], 32 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
33 'sources': [ 33 'sources': [
34 '../storage/webkit_storage_export.h', 34 '../storage/webkit_storage_export.h',
35 '<@(webkit_appcache_sources)', 35 '<@(webkit_appcache_sources)',
36 '<@(webkit_dom_storage_sources)', 36 '<@(webkit_dom_storage_sources)',
37 37
38 # TODO(kinuko): Deprecate them when we have new targets for 38 # TODO(kinuko): Deprecate them when we have new targets for
39 # browser|common|renderer. crbug.com/239710 39 # browser|common|renderer. crbug.com/239710
40 '<@(webkit_browser_storage_sources)', 40 '<@(webkit_browser_storage_sources)',
41 '<@(webkit_common_storage_sources)', 41 '<@(webkit_common_storage_sources)',
42 '../renderer/fileapi/webfilewriter_base.cc', 42 '../renderer/fileapi/webfilewriter_base.cc',
43 '../renderer/fileapi/webfilewriter_base.h', 43 '../renderer/fileapi/webfilewriter_base.h',
44 ], 44 ],
45 'conditions': [ 45 'conditions': [
46 ['chromeos==1', { 46 ['chromeos==1', {
47 'sources': [ 47 'sources': [
48 '<@(webkit_browser_fileapi_chromeos_sources)', 48 '<@(webkit_browser_fileapi_chromeos_sources)',
49 ], 49 ],
50 }], 50 }],
51 ], 51 ],
52 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 52 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
53 'msvs_disabled_warnings': [ 4267, ], 53 'msvs_disabled_warnings': [ 4267, ],
54 }, 54 },
55 ], 55 ],
56 } 56 }
OLDNEW
« no previous file with comments | « webkit/plugins/webkit_plugins.gypi ('k') | win8/metro_driver/metro_driver.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698