| OLD | NEW |
| 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 5787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5798 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn | 5798 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn |
| 5799 ['clang==1', { | 5799 ['clang==1', { |
| 5800 'VCCLCompilerTool': { | 5800 'VCCLCompilerTool': { |
| 5801 'AdditionalOptions': [ | 5801 'AdditionalOptions': [ |
| 5802 # Many files use intrinsics without including this header. | 5802 # Many files use intrinsics without including this header. |
| 5803 # TODO(hans): Fix those files, or move this to sub-GYPs. | 5803 # TODO(hans): Fix those files, or move this to sub-GYPs. |
| 5804 '/FIIntrin.h', | 5804 '/FIIntrin.h', |
| 5805 | 5805 |
| 5806 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 | 5806 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 |
| 5807 '-Qunused-arguments', # http://crbug.com/504658 | 5807 '-Qunused-arguments', # http://crbug.com/504658 |
| 5808 '-Wno-microsoft-unqualified-friend', # http://crbug.com/50529
6 | |
| 5809 '-Wno-microsoft-enum-value', # http://crbug.com/505296 | 5808 '-Wno-microsoft-enum-value', # http://crbug.com/505296 |
| 5810 '-Wno-unknown-pragmas', # http://crbug.com/505314 | 5809 '-Wno-unknown-pragmas', # http://crbug.com/505314 |
| 5811 '-Wno-unused-value', # http://crbug.com/505318 | 5810 '-Wno-unused-value', # http://crbug.com/505318 |
| 5812 ], | 5811 ], |
| 5813 }, | 5812 }, |
| 5814 }], | 5813 }], |
| 5815 ['clang==1 and clang_use_chrome_plugins==1', { | 5814 ['clang==1 and clang_use_chrome_plugins==1', { |
| 5816 'VCCLCompilerTool': { | 5815 'VCCLCompilerTool': { |
| 5817 'AdditionalOptions': [ | 5816 'AdditionalOptions': [ |
| 5818 '<@(clang_chrome_plugins_flags)', | 5817 '<@(clang_chrome_plugins_flags)', |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6322 # settings in target dicts. SYMROOT is a special case, because many other | 6321 # settings in target dicts. SYMROOT is a special case, because many other |
| 6323 # Xcode variables depend on it, including variables such as | 6322 # Xcode variables depend on it, including variables such as |
| 6324 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6323 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6325 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6324 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6326 # files to appear (when present) in the UI as actual files and not red | 6325 # files to appear (when present) in the UI as actual files and not red |
| 6327 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6326 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6328 # and therefore SYMROOT, needs to be set at the project level. | 6327 # and therefore SYMROOT, needs to be set at the project level. |
| 6329 'SYMROOT': '<(DEPTH)/xcodebuild', | 6328 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6330 }, | 6329 }, |
| 6331 } | 6330 } |
| OLD | NEW |