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

Side by Side Diff: content/content_shell_and_tests.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/content.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 }, 8 },
9 'target_defaults': {
10 'conditions': [
11 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
12 ['OS=="win" and target_arch=="x64"', {
13 'msvs_settings': {
14 'VCCLCompilerTool': {
15 'AdditionalOptions': ['/bigobj'],
16 },
17 },
18 }],
19 ],
20 },
21 'includes': [ 9 'includes': [
22 'content_tests.gypi', 10 'content_tests.gypi',
23 ], 11 ],
24 'conditions': [ 12 'conditions': [
25 ['OS != "ios"', { 13 ['OS != "ios"', {
26 'includes': [ 14 'includes': [
27 '../build/win_precompile.gypi', 15 '../build/win_precompile.gypi',
28 'content_shell.gypi', 16 'content_shell.gypi',
29 ], 17 ],
30 }], 18 }],
31 ], 19 ],
32 } 20 }
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698