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

Side by Side Diff: content/content.gyp

Issue 1190813002: Make GN build match gyp (/bigobj everywhere) and remove now-unnecessary settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « content/common/BUILD.gn ('k') | content/content_shell_and_tests.gyp » ('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 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' , 9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' ,
10 }, 10 },
11 'target_defaults': { 11 'target_defaults': {
12 'defines': ['CONTENT_IMPLEMENTATION'], 12 'defines': ['CONTENT_IMPLEMENTATION'],
13 'conditions': [
14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
15 ['OS=="win" and target_arch=="x64"', {
16 'msvs_settings': {
17 'VCCLCompilerTool': {
18 'AdditionalOptions': ['/bigobj'],
19 },
20 },
21 }],
22 ],
23 }, 13 },
24 'conditions': [ 14 'conditions': [
25 ['OS != "ios"', { 15 ['OS != "ios"', {
26 'includes': [ 16 'includes': [
27 '../build/win_precompile.gypi', 17 '../build/win_precompile.gypi',
28 'content_resources.gypi', 18 'content_resources.gypi',
29 ], 19 ],
30 }], 20 }],
31 ['OS == "win"', { 21 ['OS == "win"', {
32 'targets': [ 22 'targets': [
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 ], 610 ],
621 }, 611 },
622 ], 612 ],
623 }], 613 }],
624 ], 614 ],
625 }, 615 },
626 ], 616 ],
627 }], # OS == "android" 617 }], # OS == "android"
628 ], 618 ],
629 } 619 }
OLDNEW
« no previous file with comments | « content/common/BUILD.gn ('k') | content/content_shell_and_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698