| 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 3069 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3080 'defines': ['USE_NSS_CERTS=1'], | 3080 'defines': ['USE_NSS_CERTS=1'], |
| 3081 }], | 3081 }], |
| 3082 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { | 3082 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { |
| 3083 'defines': ['OS_CHROMEOS=1'], | 3083 'defines': ['OS_CHROMEOS=1'], |
| 3084 }], | 3084 }], |
| 3085 ['enable_wexit_time_destructors==1 and OS!="win"', { | 3085 ['enable_wexit_time_destructors==1 and OS!="win"', { |
| 3086 # TODO: Enable on Windows too, http://crbug.com/404525 | 3086 # TODO: Enable on Windows too, http://crbug.com/404525 |
| 3087 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, | 3087 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, |
| 3088 }], | 3088 }], |
| 3089 ['chromium_code==0', { | 3089 ['chromium_code==0', { |
| 3090 'variables': { |
| 3091 'clang_warning_flags': [ |
| 3092 # TODO(mgiuca): Move this suppression into individual third-party |
| 3093 # libraries as required. http://crbug.com/505301. |
| 3094 '-Wno-overloaded-virtual', |
| 3095 ], |
| 3096 }, |
| 3090 'conditions': [ | 3097 'conditions': [ |
| 3091 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { | 3098 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { |
| 3092 # We don't want to get warnings from third-party code, | 3099 # We don't want to get warnings from third-party code, |
| 3093 # so remove any existing warning-enabling flags like -Wall. | 3100 # so remove any existing warning-enabling flags like -Wall. |
| 3094 'cflags!': [ | 3101 'cflags!': [ |
| 3095 '-Wall', | 3102 '-Wall', |
| 3096 '-Wextra', | 3103 '-Wextra', |
| 3097 ], | 3104 ], |
| 3098 'cflags_cc': [ | 3105 'cflags_cc': [ |
| 3099 # Don't warn about hash_map in third-party code. | 3106 # Don't warn about hash_map in third-party code. |
| (...skipping 2600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5700 | 5707 |
| 5701 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 | 5708 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 |
| 5702 '-Qunused-arguments', # http://crbug.com/504658 | 5709 '-Qunused-arguments', # http://crbug.com/504658 |
| 5703 '-Wno-empty-body', # http://crbug.com/504661 | 5710 '-Wno-empty-body', # http://crbug.com/504661 |
| 5704 '-Wno-extra-tokens', # http://crbug.com/504663 | 5711 '-Wno-extra-tokens', # http://crbug.com/504663 |
| 5705 '-Wno-incompatible-pointer-types', # http://crbug.com/504696 | 5712 '-Wno-incompatible-pointer-types', # http://crbug.com/504696 |
| 5706 '-Wno-logical-op-parentheses', # http://crbug.com/504699 | 5713 '-Wno-logical-op-parentheses', # http://crbug.com/504699 |
| 5707 '-Wno-microsoft', # http://crbug.com/505296 | 5714 '-Wno-microsoft', # http://crbug.com/505296 |
| 5708 '-Wno-missing-braces', # http://crbug.com/505297 | 5715 '-Wno-missing-braces', # http://crbug.com/505297 |
| 5709 '-Wno-msvc-include', # http://crbug.com/505299 | 5716 '-Wno-msvc-include', # http://crbug.com/505299 |
| 5710 '-Wno-overloaded-virtual', # http://crbug.com/505301 | |
| 5711 '-Wno-pointer-sign', # http://crbug.com/505303 | 5717 '-Wno-pointer-sign', # http://crbug.com/505303 |
| 5712 '-Wno-reorder', # http://crbug.com/505304 | 5718 '-Wno-reorder', # http://crbug.com/505304 |
| 5713 '-Wno-switch', # http://crbug.com/505308 | 5719 '-Wno-switch', # http://crbug.com/505308 |
| 5714 '-Wno-unknown-pragmas', # http://crbug.com/505314 | 5720 '-Wno-unknown-pragmas', # http://crbug.com/505314 |
| 5715 '-Wno-unused-function', # http://crbug.com/505316 | 5721 '-Wno-unused-function', # http://crbug.com/505316 |
| 5716 '-Wno-unused-private-field', # http://crbug.com/505317 | 5722 '-Wno-unused-private-field', # http://crbug.com/505317 |
| 5717 '-Wno-unused-value', # http://crbug.com/505318 | 5723 '-Wno-unused-value', # http://crbug.com/505318 |
| 5718 '-Wno-unused-variable', # http://crbug.com/505319 | 5724 '-Wno-unused-variable', # http://crbug.com/505319 |
| 5719 '-Wno-unused-local-typedef', # http://crbug.com/411648 | 5725 '-Wno-unused-local-typedef', # http://crbug.com/411648 |
| 5720 ], | 5726 ], |
| (...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6186 # settings in target dicts. SYMROOT is a special case, because many other | 6192 # settings in target dicts. SYMROOT is a special case, because many other |
| 6187 # Xcode variables depend on it, including variables such as | 6193 # Xcode variables depend on it, including variables such as |
| 6188 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6194 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6189 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6195 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6190 # files to appear (when present) in the UI as actual files and not red | 6196 # files to appear (when present) in the UI as actual files and not red |
| 6191 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6197 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6192 # and therefore SYMROOT, needs to be set at the project level. | 6198 # and therefore SYMROOT, needs to be set at the project level. |
| 6193 'SYMROOT': '<(DEPTH)/xcodebuild', | 6199 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6194 }, | 6200 }, |
| 6195 } | 6201 } |
| OLD | NEW |