| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 2148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2159 | 2159 |
| 2160 # Don't die on dtoa code that uses a char as an array index. | 2160 # Don't die on dtoa code that uses a char as an array index. |
| 2161 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 2161 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 2162 '-Wno-char-subscripts', | 2162 '-Wno-char-subscripts', |
| 2163 | 2163 |
| 2164 # Clang spots more unused functions. | 2164 # Clang spots more unused functions. |
| 2165 '-Wno-unused-function', | 2165 '-Wno-unused-function', |
| 2166 | 2166 |
| 2167 # See comments on this flag higher up in this file. | 2167 # See comments on this flag higher up in this file. |
| 2168 '-Wno-unnamed-type-template-args', | 2168 '-Wno-unnamed-type-template-args', |
| 2169 | |
| 2170 # TODO(thakis): Reenable once the one instance this warns on | |
| 2171 # is fixed. | |
| 2172 '-Wno-parentheses', | |
| 2173 ], | 2169 ], |
| 2174 }], | 2170 }], |
| 2175 ['clang==1 and clang_use_chrome_plugins==1', { | 2171 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2176 'OTHER_CFLAGS': [ | 2172 'OTHER_CFLAGS': [ |
| 2177 '<(clang_chrome_plugins_flags)', | 2173 '<(clang_chrome_plugins_flags)', |
| 2178 ], | 2174 ], |
| 2179 }], | 2175 }], |
| 2180 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { | 2176 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { |
| 2181 'OTHER_CFLAGS': [ | 2177 'OTHER_CFLAGS': [ |
| 2182 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2178 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2532 # settings in target dicts. SYMROOT is a special case, because many other | 2528 # settings in target dicts. SYMROOT is a special case, because many other |
| 2533 # Xcode variables depend on it, including variables such as | 2529 # Xcode variables depend on it, including variables such as |
| 2534 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2530 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2535 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2531 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2536 # files to appear (when present) in the UI as actual files and not red | 2532 # files to appear (when present) in the UI as actual files and not red |
| 2537 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2533 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2538 # and therefore SYMROOT, needs to be set at the project level. | 2534 # and therefore SYMROOT, needs to be set at the project level. |
| 2539 'SYMROOT': '<(DEPTH)/xcodebuild', | 2535 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2540 }, | 2536 }, |
| 2541 } | 2537 } |
| OLD | NEW |