| 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 3093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3104 # clang is rolled far enough that the pinned clang understands this flag | 3104 # clang is rolled far enough that the pinned clang understands this flag |
| 3105 # TODO(thakis): Enable this, crbug.com/507717 | 3105 # TODO(thakis): Enable this, crbug.com/507717 |
| 3106 'variables': { 'clang_warning_flags': ['-Wno-shift-negative-value']}, | 3106 'variables': { 'clang_warning_flags': ['-Wno-shift-negative-value']}, |
| 3107 }], | 3107 }], |
| 3108 ['chromium_code==0', { | 3108 ['chromium_code==0', { |
| 3109 'variables': { | 3109 'variables': { |
| 3110 'clang_warning_flags': [ | 3110 'clang_warning_flags': [ |
| 3111 # TODO(mgiuca): Move this suppression into individual third-party | 3111 # TODO(mgiuca): Move this suppression into individual third-party |
| 3112 # libraries as required. http://crbug.com/505301. | 3112 # libraries as required. http://crbug.com/505301. |
| 3113 '-Wno-overloaded-virtual', | 3113 '-Wno-overloaded-virtual', |
| 3114 # Lots of third-party libraries have unused variables. Instead of |
| 3115 # suppressing them individually, we just blanket suppress them here. |
| 3116 '-Wno-unused-variable', |
| 3114 ], | 3117 ], |
| 3115 }, | 3118 }, |
| 3116 'conditions': [ | 3119 'conditions': [ |
| 3117 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { | 3120 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { |
| 3118 # We don't want to get warnings from third-party code, | 3121 # We don't want to get warnings from third-party code, |
| 3119 # so remove any existing warning-enabling flags like -Wall. | 3122 # so remove any existing warning-enabling flags like -Wall. |
| 3120 'cflags!': [ | 3123 'cflags!': [ |
| 3121 '-Wall', | 3124 '-Wall', |
| 3122 '-Wextra', | 3125 '-Wextra', |
| 3123 ], | 3126 ], |
| (...skipping 2604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5728 '-Qunused-arguments', # http://crbug.com/504658 | 5731 '-Qunused-arguments', # http://crbug.com/504658 |
| 5729 '-Wno-extra-tokens', # http://crbug.com/504663 | 5732 '-Wno-extra-tokens', # http://crbug.com/504663 |
| 5730 '-Wno-microsoft', # http://crbug.com/505296 | 5733 '-Wno-microsoft', # http://crbug.com/505296 |
| 5731 '-Wno-missing-braces', # http://crbug.com/505297 | 5734 '-Wno-missing-braces', # http://crbug.com/505297 |
| 5732 '-Wno-pointer-sign', # http://crbug.com/505303 | 5735 '-Wno-pointer-sign', # http://crbug.com/505303 |
| 5733 '-Wno-switch', # http://crbug.com/505308 | 5736 '-Wno-switch', # http://crbug.com/505308 |
| 5734 '-Wno-unknown-pragmas', # http://crbug.com/505314 | 5737 '-Wno-unknown-pragmas', # http://crbug.com/505314 |
| 5735 '-Wno-unused-function', # http://crbug.com/505316 | 5738 '-Wno-unused-function', # http://crbug.com/505316 |
| 5736 '-Wno-unused-private-field', # http://crbug.com/505317 | 5739 '-Wno-unused-private-field', # http://crbug.com/505317 |
| 5737 '-Wno-unused-value', # http://crbug.com/505318 | 5740 '-Wno-unused-value', # http://crbug.com/505318 |
| 5738 '-Wno-unused-variable', # http://crbug.com/505319 | |
| 5739 '-Wno-unused-local-typedef', # http://crbug.com/411648 | 5741 '-Wno-unused-local-typedef', # http://crbug.com/411648 |
| 5740 ], | 5742 ], |
| 5741 }, | 5743 }, |
| 5742 }], | 5744 }], |
| 5743 ['clang==1 and target_arch=="ia32"', { | 5745 ['clang==1 and target_arch=="ia32"', { |
| 5744 'VCCLCompilerTool': { | 5746 'VCCLCompilerTool': { |
| 5745 'WarnAsError': 'false', | 5747 'WarnAsError': 'false', |
| 5746 'AdditionalOptions': [ | 5748 'AdditionalOptions': [ |
| 5747 '/fallback', | 5749 '/fallback', |
| 5748 ], | 5750 ], |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6206 # settings in target dicts. SYMROOT is a special case, because many other | 6208 # settings in target dicts. SYMROOT is a special case, because many other |
| 6207 # Xcode variables depend on it, including variables such as | 6209 # Xcode variables depend on it, including variables such as |
| 6208 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6210 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6209 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6211 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6210 # files to appear (when present) in the UI as actual files and not red | 6212 # files to appear (when present) in the UI as actual files and not red |
| 6211 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6213 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6212 # and therefore SYMROOT, needs to be set at the project level. | 6214 # and therefore SYMROOT, needs to be set at the project level. |
| 6213 'SYMROOT': '<(DEPTH)/xcodebuild', | 6215 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6214 }, | 6216 }, |
| 6215 } | 6217 } |
| OLD | NEW |