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

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

Issue 11103031: webkit: Merge blob and fileapi into one build target 'storage' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Leave *.gypi files in blob and fileapi 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/glue/webkit_glue.gypi ('k') | webkit/storage/webkit_storage_export.h » ('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': [
16 '../blob/webkit_blob.gypi',
17 '../fileapi/webkit_fileapi.gypi',
18 ],
15 'targets': [ 19 'targets': [
16 { 20 {
17 'target_name': 'blob', 21 'target_name': 'webkit_storage',
18 'type': '<(component)', 22 'type': '<(component)',
19 'variables': { 'enable_wexit_time_destructors': 1, }, 23 'variables': { 'enable_wexit_time_destructors': 1, },
20 'dependencies': [ 24 'dependencies': [
21 '<(DEPTH)/base/base.gyp:base', 25 '<(DEPTH)/base/base.gyp:base',
22 '<(DEPTH)/base/base.gyp:base_i18n', 26 '<(DEPTH)/base/base.gyp:base_i18n',
23 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 27 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
24 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 28 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
25 '<(DEPTH)/net/net.gyp:net', 29 '<(DEPTH)/net/net.gyp:net',
30 '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
31 '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
26 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', 32 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
27 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 33 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
28 ], 34 ],
29 'defines': [ 35 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
30 'BLOB_IMPLEMENTATION'
31 ],
32 'sources': [ 36 'sources': [
33 'blob_data.cc', 37 # TODO(hashimoto): Import all storage related modules. crbug.com/155242
34 'blob_data.h', 38 '../storage/webkit_storage_export.h',
35 'blob_storage_controller.cc', 39 '<@(webkit_blob_sources)',
36 'blob_storage_controller.h', 40 '<@(webkit_fileapi_sources)',
37 'blob_url_request_job.cc',
38 'blob_url_request_job.h',
39 'blob_url_request_job_factory.cc',
40 'blob_url_request_job_factory.h',
41 'local_file_stream_reader.cc',
42 'local_file_stream_reader.h',
43 'shareable_file_reference.cc',
44 'shareable_file_reference.h',
45 'view_blob_internals_job.cc',
46 'view_blob_internals_job.h',
47 ], 41 ],
48 'conditions': [ 42 'conditions': [
49 ['inside_chromium_build==0', { 43 ['inside_chromium_build==0', {
50 'dependencies': [ 44 'dependencies': [
51 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 45 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
52 ], 46 ],
53 }], 47 }],
48 ['chromeos==1', {
49 'sources': [
50 '<@(webkit_fileapi_chromeos_sources)',
51 ],
52 }],
53 ['OS=="linux" or chromeos==1', {
54 'sources': [
55 '<@(webkit_fileapi_media_sources)',
56 ],
57 }],
54 ], 58 ],
55 }, 59 },
56 ], 60 ],
57 } 61 }
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/storage/webkit_storage_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698