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

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

Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/storage/webkit_storage.gypi:r3734-4217,4606-5108,5177-5263
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 '../blob/webkit_blob.gypi', 8 '../blob/webkit_blob.gypi',
9 '../database/webkit_database.gypi', 9 '../database/webkit_database.gypi',
10 '../dom_storage/webkit_dom_storage.gypi', 10 '../dom_storage/webkit_dom_storage.gypi',
11 '../fileapi/webkit_fileapi.gypi', 11 '../fileapi/webkit_fileapi.gypi',
12 '../quota/webkit_quota.gypi', 12 '../quota/webkit_quota.gypi',
13
14 # TODO(kinuko): Deprecate this when we have a new target for
15 # webkit_browser. crbug.com/239710
16 '../browser/webkit_browser.gypi',
17 ], 13 ],
18 'targets': [ 14 'targets': [
19 { 15 {
20 'target_name': 'webkit_storage', 16 'target_name': 'webkit_storage',
21 'type': '<(component)', 17 'type': '<(component)',
22 'variables': { 'enable_wexit_time_destructors': 1, }, 18 'variables': { 'enable_wexit_time_destructors': 1, },
23 'dependencies': [ 19 'dependencies': [
24 '<(DEPTH)/base/base.gyp:base', 20 '<(DEPTH)/base/base.gyp:base',
25 '<(DEPTH)/base/base.gyp:base_i18n', 21 '<(DEPTH)/base/base.gyp:base_i18n',
26 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 22 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
27 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 23 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
28 '<(DEPTH)/net/net.gyp:net', 24 '<(DEPTH)/net/net.gyp:net',
29 '<(DEPTH)/sql/sql.gyp:sql', 25 '<(DEPTH)/sql/sql.gyp:sql',
30 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 26 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
31 '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 27 '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
32 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 28 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
33 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', 29 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
34 ], 30 ],
35 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], 31 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
36 'sources': [ 32 'sources': [
37 '../storage/webkit_storage_export.h', 33 '../storage/webkit_storage_export.h',
38 '<@(webkit_appcache_sources)', 34 '<@(webkit_appcache_sources)',
39 '<@(webkit_blob_sources)', 35 '<@(webkit_blob_sources)',
40 '<@(webkit_database_sources)', 36 '<@(webkit_database_sources)',
41 '<@(webkit_dom_storage_sources)', 37 '<@(webkit_dom_storage_sources)',
42 '<@(webkit_fileapi_sources)', 38 '<@(webkit_fileapi_sources)',
43 '<@(webkit_quota_sources)', 39 '<@(webkit_quota_sources)',
44 # TODO(kinuko): Deprecate this when we have a new target for
45 # webkit_browser. crbug.com/239710
46 '<@(webkit_browser_storage_sources)',
47 ], 40 ],
48 'conditions': [ 41 'conditions': [
49 ['chromeos==1', { 42 ['chromeos==1', {
50 'sources': [ 43 'sources': [
51 '<@(webkit_fileapi_chromeos_sources)', 44 '<@(webkit_fileapi_chromeos_sources)',
52 ], 45 ],
53 }], 46 }],
54 ], 47 ],
55 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 48 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
56 'msvs_disabled_warnings': [ 4267, ], 49 'msvs_disabled_warnings': [ 4267, ],
57 }, 50 },
58 ], 51 ],
59 } 52 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698