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

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

Issue 11230022: webkit: Merge build target 'appcache' to 'webkit_storage' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 8 years, 2 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/appcache/webkit_appcache.gypi ('k') | webkit/support/webkit_support.gypi » ('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 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
11 'webkit_src_dir': '../../third_party/WebKit', 11 'webkit_src_dir': '../../third_party/WebKit',
12 }], 12 }],
13 ], 13 ],
14 }, 14 },
15 'includes': [ 15 'includes': [
16 '../appcache/webkit_appcache.gypi',
16 '../blob/webkit_blob.gypi', 17 '../blob/webkit_blob.gypi',
17 '../fileapi/webkit_fileapi.gypi', 18 '../fileapi/webkit_fileapi.gypi',
18 ], 19 ],
19 'targets': [ 20 'targets': [
20 { 21 {
21 'target_name': 'webkit_storage', 22 'target_name': 'webkit_storage',
22 'type': '<(component)', 23 'type': '<(component)',
23 'variables': { 'enable_wexit_time_destructors': 1, }, 24 'variables': { 'enable_wexit_time_destructors': 1, },
24 'dependencies': [ 25 'dependencies': [
25 '<(DEPTH)/base/base.gyp:base', 26 '<(DEPTH)/base/base.gyp:base',
26 '<(DEPTH)/base/base.gyp:base_i18n', 27 '<(DEPTH)/base/base.gyp:base_i18n',
27 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 28 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
28 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 29 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
29 '<(DEPTH)/net/net.gyp:net', 30 '<(DEPTH)/net/net.gyp:net',
31 '<(DEPTH)/sql/sql.gyp:sql',
30 '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 32 '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
31 '<(DEPTH)/webkit/support/webkit_support.gyp:quota', 33 '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
32 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', 34 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
33 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 35 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
34 ], 36 ],
35 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], 37 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
36 'sources': [ 38 'sources': [
37 # TODO(hashimoto): Import all storage related modules. crbug.com/155242 39 # TODO(hashimoto): Import all storage related modules. crbug.com/155242
38 '../storage/webkit_storage_export.h', 40 '../storage/webkit_storage_export.h',
41 '<@(webkit_appcache_sources)',
39 '<@(webkit_blob_sources)', 42 '<@(webkit_blob_sources)',
40 '<@(webkit_fileapi_sources)', 43 '<@(webkit_fileapi_sources)',
41 ], 44 ],
42 'conditions': [ 45 'conditions': [
43 ['inside_chromium_build==0', { 46 ['inside_chromium_build==0', {
44 'dependencies': [ 47 'dependencies': [
45 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 48 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
46 ], 49 ],
47 }], 50 }],
48 ['chromeos==1', { 51 ['chromeos==1', {
49 'sources': [ 52 'sources': [
50 '<@(webkit_fileapi_chromeos_sources)', 53 '<@(webkit_fileapi_chromeos_sources)',
51 ], 54 ],
52 }], 55 }],
53 ['OS=="linux" or chromeos==1', { 56 ['OS=="linux" or chromeos==1', {
54 'sources': [ 57 'sources': [
55 '<@(webkit_fileapi_media_sources)', 58 '<@(webkit_fileapi_media_sources)',
56 ], 59 ],
57 }], 60 }],
58 ], 61 ],
59 }, 62 },
60 ], 63 ],
61 } 64 }
OLDNEW
« no previous file with comments | « webkit/appcache/webkit_appcache.gypi ('k') | webkit/support/webkit_support.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698