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

Side by Side Diff: content/content.gyp

Issue 8501025: reenable component build w/ fix to test_support_content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
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 # TODO(dpranke): Uncomment: ['component == "static_library"', { 25 #
26 ['1 == 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"', {
27 'targets': [ 30 'targets': [
28 {'target_name': 'content', 31 {'target_name': 'content',
29 'type': 'none', 32 'type': 'none',
30 'dependencies': [ 33 'dependencies': [
31 'content_app', 34 'content_app',
32 'content_browser', 35 'content_browser',
33 'content_common', 36 'content_common',
34 'content_gpu', 37 'content_gpu',
35 'content_plugin', 38 'content_plugin',
36 'content_ppapi_plugin', 39 'content_ppapi_plugin',
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 }, 234 },
232 {'target_name': 'content_worker', 235 {'target_name': 'content_worker',
233 'type': 'none', 236 'type': 'none',
234 'dependencies': ['content'], 237 'dependencies': ['content'],
235 }, 238 },
236 ], 239 ],
237 }, 240 },
238 ], 241 ],
239 ], 242 ],
240 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698