| 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 3090 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3101 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { | 3101 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { |
| 3102 'defines': ['USE_NSS_CERTS=1'], | 3102 'defines': ['USE_NSS_CERTS=1'], |
| 3103 }], | 3103 }], |
| 3104 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { | 3104 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { |
| 3105 'defines': ['OS_CHROMEOS=1'], | 3105 'defines': ['OS_CHROMEOS=1'], |
| 3106 }], | 3106 }], |
| 3107 ['enable_wexit_time_destructors==1 and OS!="win"', { | 3107 ['enable_wexit_time_destructors==1 and OS!="win"', { |
| 3108 # TODO: Enable on Windows too, http://crbug.com/404525 | 3108 # TODO: Enable on Windows too, http://crbug.com/404525 |
| 3109 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, | 3109 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, |
| 3110 }], | 3110 }], |
| 3111 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2
45965-1"', { |
| 3112 # TODO(thakis): Move this to the global clang_warning_flags block once |
| 3113 # clang is rolled far enough that the pinned clang understands this flag |
| 3114 # TODO(thakis): Consider enabling this? |
| 3115 'variables': { 'clang_warning_flags': ['-Wno-bitfield-width']}, |
| 3116 }], |
| 3111 ['chromium_code==0', { | 3117 ['chromium_code==0', { |
| 3112 'variables': { | 3118 'variables': { |
| 3113 'clang_warning_flags': [ | 3119 'clang_warning_flags': [ |
| 3114 # TODO(thakis): Move this suppression into individual third-party | 3120 # TODO(thakis): Move this suppression into individual third-party |
| 3115 # libraries as required. http://crbug.com/505316. | 3121 # libraries as required. http://crbug.com/505316. |
| 3116 '-Wno-unused-function', | 3122 '-Wno-unused-function', |
| 3117 # Lots of third-party libraries have unused variables. Instead of | 3123 # Lots of third-party libraries have unused variables. Instead of |
| 3118 # suppressing them individually, we just blanket suppress them here. | 3124 # suppressing them individually, we just blanket suppress them here. |
| 3119 '-Wno-unused-variable', | 3125 '-Wno-unused-variable', |
| 3120 ], | 3126 ], |
| (...skipping 3179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6300 # settings in target dicts. SYMROOT is a special case, because many other | 6306 # settings in target dicts. SYMROOT is a special case, because many other |
| 6301 # Xcode variables depend on it, including variables such as | 6307 # Xcode variables depend on it, including variables such as |
| 6302 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6308 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6303 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6309 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6304 # files to appear (when present) in the UI as actual files and not red | 6310 # files to appear (when present) in the UI as actual files and not red |
| 6305 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6311 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6306 # and therefore SYMROOT, needs to be set at the project level. | 6312 # and therefore SYMROOT, needs to be set at the project level. |
| 6307 'SYMROOT': '<(DEPTH)/xcodebuild', | 6313 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6308 }, | 6314 }, |
| 6309 } | 6315 } |
| OLD | NEW |