| 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 2772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2783 # removed when we change to that. (This is also why we don't | 2783 # removed when we change to that. (This is also why we don't |
| 2784 # bother fixing all these cases today.) | 2784 # bother fixing all these cases today.) |
| 2785 '-Wno-unnamed-type-template-args', | 2785 '-Wno-unnamed-type-template-args', |
| 2786 # This (rightfully) complains about 'override', which we use | 2786 # This (rightfully) complains about 'override', which we use |
| 2787 # heavily. | 2787 # heavily. |
| 2788 '-Wno-c++11-extensions', | 2788 '-Wno-c++11-extensions', |
| 2789 | 2789 |
| 2790 # Warns on switches on enums that cover all enum values but | 2790 # Warns on switches on enums that cover all enum values but |
| 2791 # also contain a default: branch. Chrome is full of that. | 2791 # also contain a default: branch. Chrome is full of that. |
| 2792 '-Wno-covered-switch-default', | 2792 '-Wno-covered-switch-default', |
| 2793 | |
| 2794 # TODO(thakis,hans): Remove once Clang doesn't warn about false | |
| 2795 # positives in our code. | |
| 2796 '-Wno-undefined-internal', | |
| 2797 ], | 2793 ], |
| 2798 'cflags!': [ | 2794 'cflags!': [ |
| 2799 # Clang doesn't seem to know know this flag. | 2795 # Clang doesn't seem to know know this flag. |
| 2800 '-mfpmath=sse', | 2796 '-mfpmath=sse', |
| 2801 ], | 2797 ], |
| 2802 }], | 2798 }], |
| 2803 ['clang==1 and clang_use_chrome_plugins==1', { | 2799 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2804 'cflags': [ | 2800 'cflags': [ |
| 2805 '<@(clang_chrome_plugins_flags)', | 2801 '<@(clang_chrome_plugins_flags)', |
| 2806 ], | 2802 ], |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3371 | 3367 |
| 3372 # Don't die on dtoa code that uses a char as an array index. | 3368 # Don't die on dtoa code that uses a char as an array index. |
| 3373 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 3369 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 3374 '-Wno-char-subscripts', | 3370 '-Wno-char-subscripts', |
| 3375 # Clang spots more unused functions. | 3371 # Clang spots more unused functions. |
| 3376 '-Wno-unused-function', | 3372 '-Wno-unused-function', |
| 3377 | 3373 |
| 3378 # Warns on switches on enums that cover all enum values but | 3374 # Warns on switches on enums that cover all enum values but |
| 3379 # also contain a default: branch. Chrome is full of that. | 3375 # also contain a default: branch. Chrome is full of that. |
| 3380 '-Wno-covered-switch-default', | 3376 '-Wno-covered-switch-default', |
| 3381 | |
| 3382 # TODO(thakis,hans): Remove once Clang doesn't warn about false | |
| 3383 # positives in our code. | |
| 3384 '-Wno-undefined-internal', | |
| 3385 ], | 3377 ], |
| 3386 'OTHER_CPLUSPLUSFLAGS': [ | 3378 'OTHER_CPLUSPLUSFLAGS': [ |
| 3387 # gnu++11 instead of c++11 so that __ANSI_C__ doesn't get | 3379 # gnu++11 instead of c++11 so that __ANSI_C__ doesn't get |
| 3388 # defined. (Else e.g. finite() in base/float_util.h needs to | 3380 # defined. (Else e.g. finite() in base/float_util.h needs to |
| 3389 # be isfinite() which doesn't exist on the android bots.) | 3381 # be isfinite() which doesn't exist on the android bots.) |
| 3390 # typeof() is also disabled in c++11 (but we could use | 3382 # typeof() is also disabled in c++11 (but we could use |
| 3391 # decltype() instead). | 3383 # decltype() instead). |
| 3392 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all | 3384 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all |
| 3393 # bots use xcode 4 -- http://crbug.com/147515). | 3385 # bots use xcode 4 -- http://crbug.com/147515). |
| 3394 # TODO(thakis): Eventually switch this to c++11 instead of | 3386 # TODO(thakis): Eventually switch this to c++11 instead of |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4040 # settings in target dicts. SYMROOT is a special case, because many other | 4032 # settings in target dicts. SYMROOT is a special case, because many other |
| 4041 # Xcode variables depend on it, including variables such as | 4033 # Xcode variables depend on it, including variables such as |
| 4042 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4034 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4043 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4035 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4044 # files to appear (when present) in the UI as actual files and not red | 4036 # files to appear (when present) in the UI as actual files and not red |
| 4045 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4037 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4046 # and therefore SYMROOT, needs to be set at the project level. | 4038 # and therefore SYMROOT, needs to be set at the project level. |
| 4047 'SYMROOT': '<(DEPTH)/xcodebuild', | 4039 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4048 }, | 4040 }, |
| 4049 } | 4041 } |
| OLD | NEW |