| 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 2498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2509 # This warns on using ints as initializers for floats in | 2509 # This warns on using ints as initializers for floats in |
| 2510 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), | 2510 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), |
| 2511 # which happens in several places in chrome code. Not sure if | 2511 # which happens in several places in chrome code. Not sure if |
| 2512 # this is worth fixing. | 2512 # this is worth fixing. |
| 2513 '-Wno-c++11-narrowing', | 2513 '-Wno-c++11-narrowing', |
| 2514 | 2514 |
| 2515 # Clang considers the `register` keyword as deprecated, but e.g. | 2515 # Clang considers the `register` keyword as deprecated, but e.g. |
| 2516 # code generated by flex (used in angle) contains that keyword. | 2516 # code generated by flex (used in angle) contains that keyword. |
| 2517 # http://crbug.com/255186 | 2517 # http://crbug.com/255186 |
| 2518 '-Wno-deprecated-register', | 2518 '-Wno-deprecated-register', |
| 2519 | |
| 2520 # TODO(hans): Clean this up. Or disable with finer granularity. | |
| 2521 '-Wno-unused-local-typedef', | |
| 2522 ], | 2519 ], |
| 2523 }, | 2520 }, |
| 2524 'includes': [ 'set_clang_warning_flags.gypi', ], | 2521 'includes': [ 'set_clang_warning_flags.gypi', ], |
| 2525 'defines': [ | 2522 'defines': [ |
| 2526 # Don't use deprecated V8 APIs anywhere. | 2523 # Don't use deprecated V8 APIs anywhere. |
| 2527 'V8_DEPRECATION_WARNINGS', | 2524 'V8_DEPRECATION_WARNINGS', |
| 2528 ], | 2525 ], |
| 2529 'include_dirs': [ | 2526 'include_dirs': [ |
| 2530 '<(SHARED_INTERMEDIATE_DIR)', | 2527 '<(SHARED_INTERMEDIATE_DIR)', |
| 2531 ], | 2528 ], |
| (...skipping 3378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5910 # settings in target dicts. SYMROOT is a special case, because many other | 5907 # settings in target dicts. SYMROOT is a special case, because many other |
| 5911 # Xcode variables depend on it, including variables such as | 5908 # Xcode variables depend on it, including variables such as |
| 5912 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5909 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5913 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5910 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5914 # files to appear (when present) in the UI as actual files and not red | 5911 # files to appear (when present) in the UI as actual files and not red |
| 5915 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5912 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5916 # and therefore SYMROOT, needs to be set at the project level. | 5913 # and therefore SYMROOT, needs to be set at the project level. |
| 5917 'SYMROOT': '<(DEPTH)/xcodebuild', | 5914 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5918 }, | 5915 }, |
| 5919 } | 5916 } |
| OLD | NEW |