| 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 3180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3191 '-Wno-c++11-narrowing', | 3191 '-Wno-c++11-narrowing', |
| 3192 | 3192 |
| 3193 # TODO(thakis): Remove, http://crbug.com/263960 | 3193 # TODO(thakis): Remove, http://crbug.com/263960 |
| 3194 '-Wno-reserved-user-defined-literal', | 3194 '-Wno-reserved-user-defined-literal', |
| 3195 | 3195 |
| 3196 # Clang considers the `register` keyword as deprecated, but e.g. | 3196 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3197 # code generated by flex (used in angle) contains that keyword. | 3197 # code generated by flex (used in angle) contains that keyword. |
| 3198 # http://crbug.com/255186 | 3198 # http://crbug.com/255186 |
| 3199 '-Wno-deprecated-register', | 3199 '-Wno-deprecated-register', |
| 3200 | 3200 |
| 3201 # TODO(hans): Remove once we've cleaned up the warnings. | |
| 3202 # http://crbug.com/307668 | |
| 3203 '-Wno-unused-const-variable', | |
| 3204 | |
| 3205 # This warns about auto_ptr<>, used in third-party code. | 3201 # This warns about auto_ptr<>, used in third-party code. |
| 3206 '-Wno-deprecated-declarations', | 3202 '-Wno-deprecated-declarations', |
| 3207 ], | 3203 ], |
| 3208 'cflags!': [ | 3204 'cflags!': [ |
| 3209 # Clang doesn't seem to know know this flag. | 3205 # Clang doesn't seem to know know this flag. |
| 3210 '-mfpmath=sse', | 3206 '-mfpmath=sse', |
| 3211 ], | 3207 ], |
| 3212 'cflags_cc': [ | 3208 'cflags_cc': [ |
| 3213 # See the comment in the Mac section for what it takes to move | 3209 # See the comment in the Mac section for what it takes to move |
| 3214 # this to -std=c++11. | 3210 # this to -std=c++11. |
| 3215 '-std=gnu++11', | 3211 '-std=gnu++11', |
| 3216 ], | 3212 ], |
| 3217 }], | 3213 }], |
| 3218 ['clang==1 and OS=="android"', { | 3214 ['clang==1 and OS=="android"', { |
| 3219 # Android uses stlport, whose include/new defines | 3215 # Android uses stlport, whose include/new defines |
| 3220 # `void operator delete[](void* ptr) throw();`, which | 3216 # `void operator delete[](void* ptr) throw();`, which |
| 3221 # clang's -Wimplicit-exception-spec-mismatch warns about for some | 3217 # clang's -Wimplicit-exception-spec-mismatch warns about for some |
| 3222 # reason -- http://llvm.org/PR16638. TODO(thakis): Include stlport | 3218 # reason -- http://llvm.org/PR16638. TODO(thakis): Include stlport |
| 3223 # via -isystem instead. | 3219 # via -isystem instead. |
| 3224 'cflags_cc': [ | 3220 'cflags_cc': [ |
| 3225 '-Wno-implicit-exception-spec-mismatch', | 3221 '-Wno-implicit-exception-spec-mismatch', |
| 3226 ], | 3222 ], |
| 3223 'cflags': [ |
| 3224 # TODO(hans): Remove once we've cleaned up the warnings. |
| 3225 # http://crbug.com/307668 |
| 3226 '-Wno-unused-const-variable', |
| 3227 ], |
| 3227 }], | 3228 }], |
| 3228 ['clang==1 and clang_use_chrome_plugins==1', { | 3229 ['clang==1 and clang_use_chrome_plugins==1', { |
| 3229 'cflags': [ | 3230 'cflags': [ |
| 3230 '<@(clang_chrome_plugins_flags)', | 3231 '<@(clang_chrome_plugins_flags)', |
| 3231 ], | 3232 ], |
| 3232 }], | 3233 }], |
| 3233 ['clang==1 and clang_load!=""', { | 3234 ['clang==1 and clang_load!=""', { |
| 3234 'cflags': [ | 3235 'cflags': [ |
| 3235 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 3236 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 3236 ], | 3237 ], |
| (...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4727 # settings in target dicts. SYMROOT is a special case, because many other | 4728 # settings in target dicts. SYMROOT is a special case, because many other |
| 4728 # Xcode variables depend on it, including variables such as | 4729 # Xcode variables depend on it, including variables such as |
| 4729 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4730 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4730 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4731 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4731 # files to appear (when present) in the UI as actual files and not red | 4732 # files to appear (when present) in the UI as actual files and not red |
| 4732 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4733 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4733 # and therefore SYMROOT, needs to be set at the project level. | 4734 # and therefore SYMROOT, needs to be set at the project level. |
| 4734 'SYMROOT': '<(DEPTH)/xcodebuild', | 4735 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4735 }, | 4736 }, |
| 4736 } | 4737 } |
| OLD | NEW |