| 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 2491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2502 # This (rightyfully) complains about 'override', which we use | 2502 # This (rightyfully) complains about 'override', which we use |
| 2503 # heavily. | 2503 # heavily. |
| 2504 '-Wno-c++11-extensions', | 2504 '-Wno-c++11-extensions', |
| 2505 | 2505 |
| 2506 # Warns on switches on enums that cover all enum values but | 2506 # Warns on switches on enums that cover all enum values but |
| 2507 # also contain a default: branch. Chrome is full of that. | 2507 # also contain a default: branch. Chrome is full of that. |
| 2508 '-Wno-covered-switch-default', | 2508 '-Wno-covered-switch-default', |
| 2509 | 2509 |
| 2510 # TODO(thakis): Remove this. | 2510 # TODO(thakis): Remove this. |
| 2511 '-Wno-implicit-conversion-floating-point-to-bool', | 2511 '-Wno-implicit-conversion-floating-point-to-bool', |
| 2512 # TODO(thakis): Remove this once http://crbug.com/151927 is fixed. |
| 2513 '-Wno-tautological-constant-out-of-range-compare', |
| 2512 ], | 2514 ], |
| 2513 'cflags!': [ | 2515 'cflags!': [ |
| 2514 # Clang doesn't seem to know know this flag. | 2516 # Clang doesn't seem to know know this flag. |
| 2515 '-mfpmath=sse', | 2517 '-mfpmath=sse', |
| 2516 ], | 2518 ], |
| 2517 }], | 2519 }], |
| 2518 ['clang==1 and clang_use_chrome_plugins==1', { | 2520 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2519 'cflags': [ | 2521 'cflags': [ |
| 2520 '<@(clang_chrome_plugins_flags)', | 2522 '<@(clang_chrome_plugins_flags)', |
| 2521 ], | 2523 ], |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3058 # This (rightyfully) complains about 'override', which we use | 3060 # This (rightyfully) complains about 'override', which we use |
| 3059 # heavily. | 3061 # heavily. |
| 3060 '-Wno-c++11-extensions', | 3062 '-Wno-c++11-extensions', |
| 3061 | 3063 |
| 3062 # Warns on switches on enums that cover all enum values but | 3064 # Warns on switches on enums that cover all enum values but |
| 3063 # also contain a default: branch. Chrome is full of that. | 3065 # also contain a default: branch. Chrome is full of that. |
| 3064 '-Wno-covered-switch-default', | 3066 '-Wno-covered-switch-default', |
| 3065 | 3067 |
| 3066 # TODO(thakis): Remove this. | 3068 # TODO(thakis): Remove this. |
| 3067 '-Wno-implicit-conversion-floating-point-to-bool', | 3069 '-Wno-implicit-conversion-floating-point-to-bool', |
| 3070 # TODO(thakis): Remove this once http://crbug.com/151927 is fixe
d. |
| 3071 '-Wno-tautological-constant-out-of-range-compare', |
| 3068 ], | 3072 ], |
| 3069 }], | 3073 }], |
| 3070 ['clang==1 and clang_use_chrome_plugins==1', { | 3074 ['clang==1 and clang_use_chrome_plugins==1', { |
| 3071 'OTHER_CFLAGS': [ | 3075 'OTHER_CFLAGS': [ |
| 3072 '<@(clang_chrome_plugins_flags)', | 3076 '<@(clang_chrome_plugins_flags)', |
| 3073 ], | 3077 ], |
| 3074 }], | 3078 }], |
| 3075 ['clang==1 and clang_load!=""', { | 3079 ['clang==1 and clang_load!=""', { |
| 3076 'OTHER_CFLAGS': [ | 3080 'OTHER_CFLAGS': [ |
| 3077 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 3081 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3623 # settings in target dicts. SYMROOT is a special case, because many other | 3627 # settings in target dicts. SYMROOT is a special case, because many other |
| 3624 # Xcode variables depend on it, including variables such as | 3628 # Xcode variables depend on it, including variables such as |
| 3625 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3629 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3626 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3630 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3627 # files to appear (when present) in the UI as actual files and not red | 3631 # files to appear (when present) in the UI as actual files and not red |
| 3628 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3632 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3629 # and therefore SYMROOT, needs to be set at the project level. | 3633 # and therefore SYMROOT, needs to be set at the project level. |
| 3630 'SYMROOT': '<(DEPTH)/xcodebuild', | 3634 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3631 }, | 3635 }, |
| 3632 } | 3636 } |
| OLD | NEW |