| 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 4539 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4550               }], | 4550               }], | 
| 4551             ], | 4551             ], | 
| 4552           }], | 4552           }], | 
| 4553         ], | 4553         ], | 
| 4554         'msvs_system_include_dirs': [ | 4554         'msvs_system_include_dirs': [ | 
| 4555           '<(windows_sdk_path)/Include/shared', | 4555           '<(windows_sdk_path)/Include/shared', | 
| 4556           '<(windows_sdk_path)/Include/um', | 4556           '<(windows_sdk_path)/Include/um', | 
| 4557           '<(windows_sdk_path)/Include/winrt', | 4557           '<(windows_sdk_path)/Include/winrt', | 
| 4558           '$(VSInstallDir)/VC/atlmfc/include', | 4558           '$(VSInstallDir)/VC/atlmfc/include', | 
| 4559         ], | 4559         ], | 
| 4560         'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |  | 
| 4561         'msvs_cygwin_shell': 0, | 4560         'msvs_cygwin_shell': 0, | 
| 4562         'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819, | 4561         'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819, | 
| 4563           # TODO(maruel): These warnings are level 4. They will be slowly | 4562           # TODO(maruel): These warnings are level 4. They will be slowly | 
| 4564           # removed as code is fixed. | 4563           # removed as code is fixed. | 
| 4565           4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, | 4564           4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, | 
| 4566           4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4702, | 4565           4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4702, | 
| 4567           4706, | 4566           4706, | 
| 4568         ], | 4567         ], | 
| 4569         'msvs_settings': { | 4568         'msvs_settings': { | 
| 4570           'VCCLCompilerTool': { | 4569           'VCCLCompilerTool': { | 
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4882     # settings in target dicts.  SYMROOT is a special case, because many other | 4881     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 4883     # Xcode variables depend on it, including variables such as | 4882     # Xcode variables depend on it, including variables such as | 
| 4884     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 4883     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 4885     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4884     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 4886     # files to appear (when present) in the UI as actual files and not red | 4885     # files to appear (when present) in the UI as actual files and not red | 
| 4887     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4886     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 4888     # and therefore SYMROOT, needs to be set at the project level. | 4887     # and therefore SYMROOT, needs to be set at the project level. | 
| 4889     'SYMROOT': '<(DEPTH)/xcodebuild', | 4888     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 4890   }, | 4889   }, | 
| 4891 } | 4890 } | 
| OLD | NEW | 
|---|