| OLD | NEW |
| 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': { | 9 'target_defaults': { |
| 10 'conditions': [ | 10 'conditions': [ |
| 11 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. | 11 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. |
| 12 ['OS=="win" and target_arch=="x64"', { | 12 ['OS=="win" and target_arch=="x64"', { |
| 13 'msvs_settings': { | 13 'msvs_settings': { |
| 14 'VCCLCompilerTool': { | 14 'VCCLCompilerTool': { |
| 15 'AdditionalOptions': ['/bigobj'], | 15 'AdditionalOptions': ['/bigobj'], |
| 16 }, | 16 }, |
| 17 }, | 17 }, |
| 18 }], | 18 }], |
| 19 ], | 19 ], |
| 20 }, | 20 }, |
| 21 'includes': [ | 21 'includes': [ |
| 22 '../build/win_precompile.gypi', |
| 23 'content_shell.gypi', |
| 22 'content_tests.gypi', | 24 'content_tests.gypi', |
| 23 ], | 25 ], |
| 24 'conditions': [ | |
| 25 ['OS != "ios"', { | |
| 26 'includes': [ | |
| 27 '../build/win_precompile.gypi', | |
| 28 'content_shell.gypi', | |
| 29 ], | |
| 30 }], | |
| 31 ], | |
| 32 } | 26 } |
| OLD | NEW |