| 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 2486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2497 # This warns on using ints as initializers for floats in | 2497 # This warns on using ints as initializers for floats in |
| 2498 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), | 2498 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), |
| 2499 # which happens in several places in chrome code. Not sure if | 2499 # which happens in several places in chrome code. Not sure if |
| 2500 # this is worth fixing. | 2500 # this is worth fixing. |
| 2501 '-Wno-c++11-narrowing', | 2501 '-Wno-c++11-narrowing', |
| 2502 | 2502 |
| 2503 # Clang considers the `register` keyword as deprecated, but e.g. | 2503 # Clang considers the `register` keyword as deprecated, but e.g. |
| 2504 # code generated by flex (used in angle) contains that keyword. | 2504 # code generated by flex (used in angle) contains that keyword. |
| 2505 # http://crbug.com/255186 | 2505 # http://crbug.com/255186 |
| 2506 '-Wno-deprecated-register', | 2506 '-Wno-deprecated-register', |
| 2507 |
| 2508 # TODO(hans): Clean this up. Or disable with finer granularity. |
| 2509 '-Wno-unused-local-typedef', |
| 2507 ], | 2510 ], |
| 2508 }, | 2511 }, |
| 2509 'includes': [ 'set_clang_warning_flags.gypi', ], | 2512 'includes': [ 'set_clang_warning_flags.gypi', ], |
| 2510 'defines': [ | 2513 'defines': [ |
| 2511 # Don't use deprecated V8 APIs anywhere. | 2514 # Don't use deprecated V8 APIs anywhere. |
| 2512 'V8_DEPRECATION_WARNINGS', | 2515 'V8_DEPRECATION_WARNINGS', |
| 2513 ], | 2516 ], |
| 2514 'include_dirs': [ | 2517 'include_dirs': [ |
| 2515 '<(SHARED_INTERMEDIATE_DIR)', | 2518 '<(SHARED_INTERMEDIATE_DIR)', |
| 2516 ], | 2519 ], |
| (...skipping 3260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5777 # settings in target dicts. SYMROOT is a special case, because many other | 5780 # settings in target dicts. SYMROOT is a special case, because many other |
| 5778 # Xcode variables depend on it, including variables such as | 5781 # Xcode variables depend on it, including variables such as |
| 5779 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5782 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5780 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5783 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5781 # files to appear (when present) in the UI as actual files and not red | 5784 # files to appear (when present) in the UI as actual files and not red |
| 5782 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5785 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5783 # and therefore SYMROOT, needs to be set at the project level. | 5786 # and therefore SYMROOT, needs to be set at the project level. |
| 5784 'SYMROOT': '<(DEPTH)/xcodebuild', | 5787 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5785 }, | 5788 }, |
| 5786 } | 5789 } |
| OLD | NEW |