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

Side by Side Diff: content/content.gyp

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 | « build/common.gypi ('k') | webkit/appcache/webkit_appcache.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 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 }, 9 },
10 'includes': [ 10 'includes': [
11 '../build/win_precompile.gypi', 11 '../build/win_precompile.gypi',
12 'content_shell.gypi', 12 'content_shell.gypi',
13 'content_tests.gypi', 13 'content_tests.gypi',
14 ], 14 ],
15 'target_defaults': { 15 'target_defaults': {
16 'defines': ['CONTENT_IMPLEMENTATION'], 16 'defines': ['CONTENT_IMPLEMENTATION'],
17 }, 17 },
18 'conditions': [ 18 'conditions': [
19 # In component mode, we build all of content as a single DLL. 19 # In component mode, we build all of content as a single DLL.
20 # However, in the static mode, we need to build content as multiple 20 # However, in the static mode, we need to build content as multiple
21 # targets in order to prevent dependencies from getting introduced 21 # targets in order to prevent dependencies from getting introduced
22 # upstream unnecessarily (e.g., content_renderer depends on allocator 22 # upstream unnecessarily (e.g., content_renderer depends on allocator
23 # and chrome_exe depends on content_common but we don't want 23 # and chrome_exe depends on content_common but we don't want
24 # chrome_exe to have to depend on allocator). 24 # chrome_exe to have to depend on allocator).
25 # 25 ['component=="static_library" or incremental_chrome_dll==1', {
26 # TODO(dpranke): Remove the mac conditional once the circular
27 # dependencies in WebKit.gyp are fixed.
28 # See https://bugs.webkit.org/show_bug.cgi?id=68463
29 ['OS=="mac" or component=="static_library" or incremental_chrome_dll==1', {
30 'target_defines': [ 26 'target_defines': [
31 'COMPILE_CONTENT_STATICALLY', 27 'COMPILE_CONTENT_STATICALLY',
32 ], 28 ],
33 'targets': [ 29 'targets': [
34 {'target_name': 'content', 30 {'target_name': 'content',
35 'type': 'none', 31 'type': 'none',
36 'dependencies': [ 32 'dependencies': [
37 'content_app', 33 'content_app',
38 'content_browser', 34 'content_browser',
39 'content_common', 35 'content_common',
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 }, 244 },
249 {'target_name': 'content_worker', 245 {'target_name': 'content_worker',
250 'type': 'none', 246 'type': 'none',
251 'dependencies': ['content'], 247 'dependencies': ['content'],
252 }, 248 },
253 ], 249 ],
254 }, 250 },
255 ], 251 ],
256 ], 252 ],
257 } 253 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | webkit/appcache/webkit_appcache.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698