| 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 2786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2797 # removed when we change to that. (This is also why we don't | 2797 # removed when we change to that. (This is also why we don't |
| 2798 # bother fixing all these cases today.) | 2798 # bother fixing all these cases today.) |
| 2799 '-Wno-unnamed-type-template-args', | 2799 '-Wno-unnamed-type-template-args', |
| 2800 # This (rightfully) complains about 'override', which we use | 2800 # This (rightfully) complains about 'override', which we use |
| 2801 # heavily. | 2801 # heavily. |
| 2802 '-Wno-c++11-extensions', | 2802 '-Wno-c++11-extensions', |
| 2803 | 2803 |
| 2804 # Warns on switches on enums that cover all enum values but | 2804 # Warns on switches on enums that cover all enum values but |
| 2805 # also contain a default: branch. Chrome is full of that. | 2805 # also contain a default: branch. Chrome is full of that. |
| 2806 '-Wno-covered-switch-default', | 2806 '-Wno-covered-switch-default', |
| 2807 |
| 2808 # Warns when a const char[] is converted to bool. |
| 2809 '-Wstring-conversion', |
| 2807 ], | 2810 ], |
| 2808 'cflags!': [ | 2811 'cflags!': [ |
| 2809 # Clang doesn't seem to know know this flag. | 2812 # Clang doesn't seem to know know this flag. |
| 2810 '-mfpmath=sse', | 2813 '-mfpmath=sse', |
| 2811 ], | 2814 ], |
| 2812 }], | 2815 }], |
| 2813 ['clang==1 and clang_use_chrome_plugins==1', { | 2816 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2814 'cflags': [ | 2817 'cflags': [ |
| 2815 '<@(clang_chrome_plugins_flags)', | 2818 '<@(clang_chrome_plugins_flags)', |
| 2816 ], | 2819 ], |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3381 | 3384 |
| 3382 # Don't die on dtoa code that uses a char as an array index. | 3385 # Don't die on dtoa code that uses a char as an array index. |
| 3383 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 3386 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 3384 '-Wno-char-subscripts', | 3387 '-Wno-char-subscripts', |
| 3385 # Clang spots more unused functions. | 3388 # Clang spots more unused functions. |
| 3386 '-Wno-unused-function', | 3389 '-Wno-unused-function', |
| 3387 | 3390 |
| 3388 # Warns on switches on enums that cover all enum values but | 3391 # Warns on switches on enums that cover all enum values but |
| 3389 # also contain a default: branch. Chrome is full of that. | 3392 # also contain a default: branch. Chrome is full of that. |
| 3390 '-Wno-covered-switch-default', | 3393 '-Wno-covered-switch-default', |
| 3394 |
| 3395 # Warns when a const char[] is converted to bool. |
| 3396 '-Wstring-conversion', |
| 3391 ], | 3397 ], |
| 3392 'OTHER_CPLUSPLUSFLAGS': [ | 3398 'OTHER_CPLUSPLUSFLAGS': [ |
| 3393 # gnu++11 instead of c++11 so that __ANSI_C__ doesn't get | 3399 # gnu++11 instead of c++11 so that __ANSI_C__ doesn't get |
| 3394 # defined. (Else e.g. finite() in base/float_util.h needs to | 3400 # defined. (Else e.g. finite() in base/float_util.h needs to |
| 3395 # be isfinite() which doesn't exist on the android bots.) | 3401 # be isfinite() which doesn't exist on the android bots.) |
| 3396 # typeof() is also disabled in c++11 (but we could use | 3402 # typeof() is also disabled in c++11 (but we could use |
| 3397 # decltype() instead). | 3403 # decltype() instead). |
| 3398 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all | 3404 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all |
| 3399 # bots use xcode 4 -- http://crbug.com/147515). | 3405 # bots use xcode 4 -- http://crbug.com/147515). |
| 3400 # TODO(thakis): Eventually switch this to c++11 instead of | 3406 # TODO(thakis): Eventually switch this to c++11 instead of |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4046 # settings in target dicts. SYMROOT is a special case, because many other | 4052 # settings in target dicts. SYMROOT is a special case, because many other |
| 4047 # Xcode variables depend on it, including variables such as | 4053 # Xcode variables depend on it, including variables such as |
| 4048 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4049 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4050 # files to appear (when present) in the UI as actual files and not red | 4056 # files to appear (when present) in the UI as actual files and not red |
| 4051 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4052 # and therefore SYMROOT, needs to be set at the project level. | 4058 # and therefore SYMROOT, needs to be set at the project level. |
| 4053 'SYMROOT': '<(DEPTH)/xcodebuild', | 4059 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4054 }, | 4060 }, |
| 4055 } | 4061 } |
| OLD | NEW |