| 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 2590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2601 # this is worth fixing. | 2601 # this is worth fixing. |
| 2602 '-Wno-c++11-narrowing', | 2602 '-Wno-c++11-narrowing', |
| 2603 | 2603 |
| 2604 # Clang considers the `register` keyword as deprecated, but e.g. | 2604 # Clang considers the `register` keyword as deprecated, but e.g. |
| 2605 # code generated by flex (used in angle) contains that keyword. | 2605 # code generated by flex (used in angle) contains that keyword. |
| 2606 # http://crbug.com/255186 | 2606 # http://crbug.com/255186 |
| 2607 '-Wno-deprecated-register', | 2607 '-Wno-deprecated-register', |
| 2608 | 2608 |
| 2609 # TODO(hans): Get this cleaned up, http://crbug.com/428099 | 2609 # TODO(hans): Get this cleaned up, http://crbug.com/428099 |
| 2610 '-Wno-inconsistent-missing-override', | 2610 '-Wno-inconsistent-missing-override', |
| 2611 |
| 2612 # TODO(thakis): Enable this, crbug.com/507717 |
| 2613 '-Wno-shift-negative-value', |
| 2611 ], | 2614 ], |
| 2612 }, | 2615 }, |
| 2613 'includes': [ 'set_clang_warning_flags.gypi', ], | 2616 'includes': [ 'set_clang_warning_flags.gypi', ], |
| 2614 'defines': [ | 2617 'defines': [ |
| 2615 # Don't use deprecated V8 APIs anywhere. | 2618 # Don't use deprecated V8 APIs anywhere. |
| 2616 'V8_DEPRECATION_WARNINGS', | 2619 'V8_DEPRECATION_WARNINGS', |
| 2617 ], | 2620 ], |
| 2618 'include_dirs': [ | 2621 'include_dirs': [ |
| 2619 '<(SHARED_INTERMEDIATE_DIR)', | 2622 '<(SHARED_INTERMEDIATE_DIR)', |
| 2620 ], | 2623 ], |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3096 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { | 3099 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { |
| 3097 'defines': ['USE_NSS_CERTS=1'], | 3100 'defines': ['USE_NSS_CERTS=1'], |
| 3098 }], | 3101 }], |
| 3099 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { | 3102 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { |
| 3100 'defines': ['OS_CHROMEOS=1'], | 3103 'defines': ['OS_CHROMEOS=1'], |
| 3101 }], | 3104 }], |
| 3102 ['enable_wexit_time_destructors==1 and OS!="win"', { | 3105 ['enable_wexit_time_destructors==1 and OS!="win"', { |
| 3103 # TODO: Enable on Windows too, http://crbug.com/404525 | 3106 # TODO: Enable on Windows too, http://crbug.com/404525 |
| 3104 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, | 3107 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, |
| 3105 }], | 3108 }], |
| 3106 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2
39674-1"', { | |
| 3107 # TODO(thakis): Move this to the global clang_warning_flags block once | |
| 3108 # clang is rolled far enough that the pinned clang understands this flag | |
| 3109 # TODO(thakis): Enable this, crbug.com/507717 | |
| 3110 'variables': { 'clang_warning_flags': ['-Wno-shift-negative-value']}, | |
| 3111 }], | |
| 3112 ['chromium_code==0', { | 3109 ['chromium_code==0', { |
| 3113 'variables': { | 3110 'variables': { |
| 3114 'clang_warning_flags': [ | 3111 'clang_warning_flags': [ |
| 3115 # TODO(mgiuca): Move this suppression into individual third-party | 3112 # TODO(mgiuca): Move this suppression into individual third-party |
| 3116 # libraries as required. http://crbug.com/505301. | 3113 # libraries as required. http://crbug.com/505301. |
| 3117 '-Wno-overloaded-virtual', | 3114 '-Wno-overloaded-virtual', |
| 3118 # Lots of third-party libraries have unused variables. Instead of | 3115 # Lots of third-party libraries have unused variables. Instead of |
| 3119 # suppressing them individually, we just blanket suppress them here. | 3116 # suppressing them individually, we just blanket suppress them here. |
| 3120 '-Wno-unused-variable', | 3117 '-Wno-unused-variable', |
| 3121 ], | 3118 ], |
| (...skipping 3088 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6210 # settings in target dicts. SYMROOT is a special case, because many other | 6207 # settings in target dicts. SYMROOT is a special case, because many other |
| 6211 # Xcode variables depend on it, including variables such as | 6208 # Xcode variables depend on it, including variables such as |
| 6212 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6209 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6213 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6210 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6214 # files to appear (when present) in the UI as actual files and not red | 6211 # files to appear (when present) in the UI as actual files and not red |
| 6215 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6212 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6216 # and therefore SYMROOT, needs to be set at the project level. | 6213 # and therefore SYMROOT, needs to be set at the project level. |
| 6217 'SYMROOT': '<(DEPTH)/xcodebuild', | 6214 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6218 }, | 6215 }, |
| 6219 } | 6216 } |
| OLD | NEW |