| 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 5683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5694 ['clang==1', { | 5694 ['clang==1', { |
| 5695 'VCCLCompilerTool': { | 5695 'VCCLCompilerTool': { |
| 5696 'AdditionalOptions': [ | 5696 'AdditionalOptions': [ |
| 5697 # Many files use intrinsics without including this header. | 5697 # Many files use intrinsics without including this header. |
| 5698 # TODO(hans): Fix those files, or move this to sub-GYPs. | 5698 # TODO(hans): Fix those files, or move this to sub-GYPs. |
| 5699 '/FIIntrin.h', | 5699 '/FIIntrin.h', |
| 5700 | 5700 |
| 5701 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 | 5701 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 |
| 5702 '-Qunused-arguments', # http://crbug.com/504658 | 5702 '-Qunused-arguments', # http://crbug.com/504658 |
| 5703 '-Wno-c++11-compat-deprecated-writable-strings', # http://crb
ug.com/504659 | 5703 '-Wno-c++11-compat-deprecated-writable-strings', # http://crb
ug.com/504659 |
| 5704 '-Wno-deprecated-declarations', # http://crbug.com/504660 | |
| 5705 '-Wno-empty-body', # http://crbug.com/504661 | 5704 '-Wno-empty-body', # http://crbug.com/504661 |
| 5706 '-Wno-enum-conversion', # http://crbug.com/504662 | |
| 5707 '-Wno-extra-tokens', # http://crbug.com/504663 | 5705 '-Wno-extra-tokens', # http://crbug.com/504663 |
| 5708 '-Wno-ignored-attributes', # http://crbug.com/504695 | 5706 '-Wno-ignored-attributes', # http://crbug.com/504695 |
| 5709 '-Wno-incompatible-pointer-types', # http://crbug.com/504696 | 5707 '-Wno-incompatible-pointer-types', # http://crbug.com/504696 |
| 5710 '-Wno-int-to-void-pointer-cast', # http://crbug.com/504697 | 5708 '-Wno-int-to-void-pointer-cast', # http://crbug.com/504697 |
| 5711 '-Wno-invalid-noreturn', # http://crbug.com/504698 | 5709 '-Wno-invalid-noreturn', # http://crbug.com/504698 |
| 5712 '-Wno-logical-op-parentheses', # http://crbug.com/504699 | 5710 '-Wno-logical-op-parentheses', # http://crbug.com/504699 |
| 5713 '-Wno-microsoft', # http://crbug.com/505296 | 5711 '-Wno-microsoft', # http://crbug.com/505296 |
| 5714 '-Wno-missing-braces', # http://crbug.com/505297 | 5712 '-Wno-missing-braces', # http://crbug.com/505297 |
| 5715 '-Wno-msvc-include', # http://crbug.com/505299 | 5713 '-Wno-msvc-include', # http://crbug.com/505299 |
| 5716 '-Wno-overloaded-virtual', # http://crbug.com/505301 | 5714 '-Wno-overloaded-virtual', # http://crbug.com/505301 |
| 5717 '-Wno-pointer-sign', # http://crbug.com/505303 | 5715 '-Wno-pointer-sign', # http://crbug.com/505303 |
| 5718 '-Wno-reorder', # http://crbug.com/505304 | 5716 '-Wno-reorder', # http://crbug.com/505304 |
| 5719 '-Wno-return-type-c-linkage', # http://crbug.com/505305 | |
| 5720 '-Wno-sometimes-uninitialized', # http://crbug.com/505307 | 5717 '-Wno-sometimes-uninitialized', # http://crbug.com/505307 |
| 5721 '-Wno-switch', # http://crbug.com/505308 | 5718 '-Wno-switch', # http://crbug.com/505308 |
| 5722 '-Wno-unknown-pragmas', # http://crbug.com/505314 | 5719 '-Wno-unknown-pragmas', # http://crbug.com/505314 |
| 5723 '-Wno-unused-function', # http://crbug.com/505316 | 5720 '-Wno-unused-function', # http://crbug.com/505316 |
| 5724 '-Wno-unused-private-field', # http://crbug.com/505317 | 5721 '-Wno-unused-private-field', # http://crbug.com/505317 |
| 5725 '-Wno-unused-value', # http://crbug.com/505318 | 5722 '-Wno-unused-value', # http://crbug.com/505318 |
| 5726 '-Wno-unused-variable', # http://crbug.com/505319 | 5723 '-Wno-unused-variable', # http://crbug.com/505319 |
| 5727 '-Wno-unused-local-typedef', # http://crbug.com/411648 | 5724 '-Wno-unused-local-typedef', # http://crbug.com/411648 |
| 5728 ], | 5725 ], |
| 5729 }, | 5726 }, |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6194 # settings in target dicts. SYMROOT is a special case, because many other | 6191 # settings in target dicts. SYMROOT is a special case, because many other |
| 6195 # Xcode variables depend on it, including variables such as | 6192 # Xcode variables depend on it, including variables such as |
| 6196 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6193 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6197 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6194 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6198 # files to appear (when present) in the UI as actual files and not red | 6195 # files to appear (when present) in the UI as actual files and not red |
| 6199 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6196 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6200 # and therefore SYMROOT, needs to be set at the project level. | 6197 # and therefore SYMROOT, needs to be set at the project level. |
| 6201 'SYMROOT': '<(DEPTH)/xcodebuild', | 6198 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6202 }, | 6199 }, |
| 6203 } | 6200 } |
| OLD | NEW |