| 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 2225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2236 # removed when we change to that. (This is also why we don't | 2236 # removed when we change to that. (This is also why we don't |
| 2237 # bother fixing all these cases today.) | 2237 # bother fixing all these cases today.) |
| 2238 '-Wno-unnamed-type-template-args', | 2238 '-Wno-unnamed-type-template-args', |
| 2239 # This (rightyfully) complains about 'override', which we use | 2239 # This (rightyfully) complains about 'override', which we use |
| 2240 # heavily. | 2240 # heavily. |
| 2241 '-Wno-c++11-extensions', | 2241 '-Wno-c++11-extensions', |
| 2242 | 2242 |
| 2243 # Warns on switches on enums that cover all enum values but | 2243 # Warns on switches on enums that cover all enum values but |
| 2244 # also contain a default: branch. Chrome is full of that. | 2244 # also contain a default: branch. Chrome is full of that. |
| 2245 '-Wno-covered-switch-default', | 2245 '-Wno-covered-switch-default', |
| 2246 | |
| 2247 # TODO(thakis): Remove once the patch to fix violations is in. | |
| 2248 '-Wno-unused-private-field', | |
| 2249 ], | 2246 ], |
| 2250 'cflags!': [ | 2247 'cflags!': [ |
| 2251 # Clang doesn't seem to know know this flag. | 2248 # Clang doesn't seem to know know this flag. |
| 2252 '-mfpmath=sse', | 2249 '-mfpmath=sse', |
| 2253 ], | 2250 ], |
| 2254 }], | 2251 }], |
| 2255 ['clang==1 and clang_use_chrome_plugins==1', { | 2252 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2256 'cflags': [ | 2253 'cflags': [ |
| 2257 '<@(clang_chrome_plugins_flags)', | 2254 '<@(clang_chrome_plugins_flags)', |
| 2258 ], | 2255 ], |
| (...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3243 # settings in target dicts. SYMROOT is a special case, because many other | 3240 # settings in target dicts. SYMROOT is a special case, because many other |
| 3244 # Xcode variables depend on it, including variables such as | 3241 # Xcode variables depend on it, including variables such as |
| 3245 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3242 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3246 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3243 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3247 # files to appear (when present) in the UI as actual files and not red | 3244 # files to appear (when present) in the UI as actual files and not red |
| 3248 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3245 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3249 # and therefore SYMROOT, needs to be set at the project level. | 3246 # and therefore SYMROOT, needs to be set at the project level. |
| 3250 'SYMROOT': '<(DEPTH)/xcodebuild', | 3247 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3251 }, | 3248 }, |
| 3252 } | 3249 } |
| OLD | NEW |