| 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 3079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3090 ['<(use_nss_verifier)==1 and >(nacl_untrusted_build)==0', { | 3090 ['<(use_nss_verifier)==1 and >(nacl_untrusted_build)==0', { |
| 3091 'defines': ['USE_NSS_VERIFIER=1'], | 3091 'defines': ['USE_NSS_VERIFIER=1'], |
| 3092 }], | 3092 }], |
| 3093 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { | 3093 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { |
| 3094 'defines': ['OS_CHROMEOS=1'], | 3094 'defines': ['OS_CHROMEOS=1'], |
| 3095 }], | 3095 }], |
| 3096 ['enable_wexit_time_destructors==1 and OS!="win"', { | 3096 ['enable_wexit_time_destructors==1 and OS!="win"', { |
| 3097 # TODO: Enable on Windows too, http://crbug.com/404525 | 3097 # TODO: Enable on Windows too, http://crbug.com/404525 |
| 3098 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, | 3098 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, |
| 3099 }], | 3099 }], |
| 3100 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2
66460-1"', { |
| 3101 # TODO(thakis): https://crbug.com/604888 |
| 3102 'variables': { 'clang_warning_flags': ['-Wno-undefined-var-template']}, |
| 3103 }], |
| 3100 ['chromium_code==0', { | 3104 ['chromium_code==0', { |
| 3101 'variables': { | 3105 'variables': { |
| 3102 'clang_warning_flags': [ | 3106 'clang_warning_flags': [ |
| 3103 # Lots of third-party libraries have unused variables. Instead of | 3107 # Lots of third-party libraries have unused variables. Instead of |
| 3104 # suppressing them individually, we just blanket suppress them here. | 3108 # suppressing them individually, we just blanket suppress them here. |
| 3105 '-Wno-unused-variable', | 3109 '-Wno-unused-variable', |
| 3106 ], | 3110 ], |
| 3107 }, | 3111 }, |
| 3108 'conditions': [ | 3112 'conditions': [ |
| 3109 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { | 3113 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { |
| (...skipping 3226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6336 # settings in target dicts. SYMROOT is a special case, because many other | 6340 # settings in target dicts. SYMROOT is a special case, because many other |
| 6337 # Xcode variables depend on it, including variables such as | 6341 # Xcode variables depend on it, including variables such as |
| 6338 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6342 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6339 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6343 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6340 # files to appear (when present) in the UI as actual files and not red | 6344 # files to appear (when present) in the UI as actual files and not red |
| 6341 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6345 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6342 # and therefore SYMROOT, needs to be set at the project level. | 6346 # and therefore SYMROOT, needs to be set at the project level. |
| 6343 'SYMROOT': '<(DEPTH)/xcodebuild', | 6347 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6344 }, | 6348 }, |
| 6345 } | 6349 } |
| OLD | NEW |