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

Side by Side Diff: webkit/blob/webkit_blob.gypi

Issue 9254040: remove build_webkit_exes_from_webkit_gyp flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put back blob's dependency on webkit, fix indentation Created 8 years, 11 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/tools/test_shell/test_shell.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 15 'targets': [
16 { 16 {
17 'target_name': 'blob', 17 'target_name': 'blob',
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', 24 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
25 '<(DEPTH)/net/net.gyp:net', 25 '<(DEPTH)/net/net.gyp:net',
26 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
26 ], 27 ],
27 'defines': [ 28 'defines': [
28 'BLOB_IMPLEMENTATION' 29 'BLOB_IMPLEMENTATION'
29 ], 30 ],
30 'sources': [ 31 'sources': [
31 'blob_data.cc', 32 'blob_data.cc',
32 'blob_data.h', 33 'blob_data.h',
33 'blob_storage_controller.cc', 34 'blob_storage_controller.cc',
34 'blob_storage_controller.h', 35 'blob_storage_controller.h',
35 'blob_url_request_job.cc', 36 'blob_url_request_job.cc',
(...skipping 11 matching lines...) Expand all
47 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 48 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
48 ], 49 ],
49 }], 50 }],
50 # TODO(dpranke): Figure out why this works at all and/or get 51 # TODO(dpranke): Figure out why this works at all and/or get
51 # rid of it. 52 # rid of it.
52 ['OS=="win" and component == "shared_library"', { 53 ['OS=="win" and component == "shared_library"', {
53 'dependencies': [ 54 'dependencies': [
54 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', 55 '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
55 ], 56 ],
56 }], 57 }],
57 [# TODO(dpranke): Remove once the circular dependencies in
58 # WebKit.gyp are fixed on the mac.
59 # See https://bugs.webkit.org/show_bug.cgi?id=68463
60 'OS!="mac"', {
61 'dependencies': [
62 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
63 ],
64 }],
65 ], 58 ],
66 }, 59 },
67 ], 60 ],
68 } 61 }
OLDNEW
« no previous file with comments | « webkit/appcache/webkit_appcache.gypi ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698