| 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 3197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3208 ], | 3208 ], |
| 3209 }]] | 3209 }]] |
| 3210 }], | 3210 }], |
| 3211 ['clang==1', { | 3211 ['clang==1', { |
| 3212 'cflags': [ | 3212 'cflags': [ |
| 3213 '-Wheader-hygiene', | 3213 '-Wheader-hygiene', |
| 3214 | 3214 |
| 3215 # Don't die on dtoa code that uses a char as an array index. | 3215 # Don't die on dtoa code that uses a char as an array index. |
| 3216 '-Wno-char-subscripts', | 3216 '-Wno-char-subscripts', |
| 3217 | 3217 |
| 3218 # Clang spots more unused functions. | 3218 # Clang spots more unused functions. TODO remove, crbug.com/315884 |
| 3219 '-Wno-unused-function', | 3219 '-Wno-unused-function', |
| 3220 | 3220 |
| 3221 # Warns on switches on enums that cover all enum values but | 3221 # Warns on switches on enums that cover all enum values but |
| 3222 # also contain a default: branch. Chrome is full of that. | 3222 # also contain a default: branch. Chrome is full of that. |
| 3223 '-Wno-covered-switch-default', | 3223 '-Wno-covered-switch-default', |
| 3224 | 3224 |
| 3225 # Warns when a const char[] is converted to bool. | 3225 # Warns when a const char[] is converted to bool. |
| 3226 '-Wstring-conversion', | 3226 '-Wstring-conversion', |
| 3227 | 3227 |
| 3228 # C++11-related flags: | 3228 # C++11-related flags: |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3923 # This warns on using ints as initializers for floats in | 3923 # This warns on using ints as initializers for floats in |
| 3924 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), | 3924 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), |
| 3925 # which happens in several places in chrome code. Not sure if | 3925 # which happens in several places in chrome code. Not sure if |
| 3926 # this is worth fixing. | 3926 # this is worth fixing. |
| 3927 '-Wno-c++11-narrowing', | 3927 '-Wno-c++11-narrowing', |
| 3928 | 3928 |
| 3929 # Don't die on dtoa code that uses a char as an array index. | 3929 # Don't die on dtoa code that uses a char as an array index. |
| 3930 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 3930 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 3931 '-Wno-char-subscripts', | 3931 '-Wno-char-subscripts', |
| 3932 | 3932 |
| 3933 # Clang spots more unused functions. | 3933 # TODO(thakis): This used to be implied by -Wno-unused-function, |
| 3934 '-Wno-unused-function', | 3934 # which we no longer use. Check if it makes sense to remove |
| 3935 # this as well. http://crbug.com/316352 |
| 3936 '-Wno-unneeded-internal-declaration', |
| 3935 | 3937 |
| 3936 # Warns on switches on enums that cover all enum values but | 3938 # Warns on switches on enums that cover all enum values but |
| 3937 # also contain a default: branch. Chrome is full of that. | 3939 # also contain a default: branch. Chrome is full of that. |
| 3938 '-Wno-covered-switch-default', | 3940 '-Wno-covered-switch-default', |
| 3939 | 3941 |
| 3940 # Warns when a const char[] is converted to bool. | 3942 # Warns when a const char[] is converted to bool. |
| 3941 '-Wstring-conversion', | 3943 '-Wstring-conversion', |
| 3942 | 3944 |
| 3943 # Clang considers the `register` keyword as deprecated, but e.g. | 3945 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3944 # code generated by flex (used in angle) contains that keyword. | 3946 # code generated by flex (used in angle) contains that keyword. |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4212 # section above). | 4214 # section above). |
| 4213 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', | 4215 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', |
| 4214 # Warn if automatic synthesis is triggered with | 4216 # Warn if automatic synthesis is triggered with |
| 4215 # the -Wobjc-missing-property-synthesis flag. | 4217 # the -Wobjc-missing-property-synthesis flag. |
| 4216 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | 4218 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', |
| 4217 'WARNING_CFLAGS': [ | 4219 'WARNING_CFLAGS': [ |
| 4218 '-Wheader-hygiene', | 4220 '-Wheader-hygiene', |
| 4219 # Don't die on dtoa code that uses a char as an array index. | 4221 # Don't die on dtoa code that uses a char as an array index. |
| 4220 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 4222 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 4221 '-Wno-char-subscripts', | 4223 '-Wno-char-subscripts', |
| 4222 # Clang spots more unused functions. | 4224 # Clang spots more unused functions. TODO: remove, crbug.com/315884 |
| 4223 '-Wno-unused-function', | 4225 '-Wno-unused-function', |
| 4224 # Match OS X clang C++11 warning settings. | 4226 # Match OS X clang C++11 warning settings. |
| 4225 '-Wno-c++11-narrowing', | 4227 '-Wno-c++11-narrowing', |
| 4226 ], | 4228 ], |
| 4227 }, | 4229 }, |
| 4228 'target_conditions': [ | 4230 'target_conditions': [ |
| 4229 ['_toolset=="host"', { | 4231 ['_toolset=="host"', { |
| 4230 'xcode_settings': { | 4232 'xcode_settings': { |
| 4231 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot | 4233 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot |
| 4232 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', | 4234 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4690 # settings in target dicts. SYMROOT is a special case, because many other | 4692 # settings in target dicts. SYMROOT is a special case, because many other |
| 4691 # Xcode variables depend on it, including variables such as | 4693 # Xcode variables depend on it, including variables such as |
| 4692 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4694 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4693 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4695 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4694 # files to appear (when present) in the UI as actual files and not red | 4696 # files to appear (when present) in the UI as actual files and not red |
| 4695 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4697 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4696 # and therefore SYMROOT, needs to be set at the project level. | 4698 # and therefore SYMROOT, needs to be set at the project level. |
| 4697 'SYMROOT': '<(DEPTH)/xcodebuild', | 4699 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4698 }, | 4700 }, |
| 4699 } | 4701 } |
| OLD | NEW |