| 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 5745 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5756               'VCCLCompilerTool': { | 5756               'VCCLCompilerTool': { | 
| 5757                 'AdditionalOptions': [ | 5757                 'AdditionalOptions': [ | 
| 5758                   # Many files use intrinsics without including this header. | 5758                   # Many files use intrinsics without including this header. | 
| 5759                   # TODO(hans): Fix those files, or move this to sub-GYPs. | 5759                   # TODO(hans): Fix those files, or move this to sub-GYPs. | 
| 5760                   '/FIIntrin.h', | 5760                   '/FIIntrin.h', | 
| 5761 | 5761 | 
| 5762                   # TODO(hans): Make this list shorter eventually, http://crbug.
      com/504657 | 5762                   # TODO(hans): Make this list shorter eventually, http://crbug.
      com/504657 | 
| 5763                   '-Qunused-arguments',  # http://crbug.com/504658 | 5763                   '-Qunused-arguments',  # http://crbug.com/504658 | 
| 5764                   '-Wno-microsoft-enum-value',  # http://crbug.com/505296 | 5764                   '-Wno-microsoft-enum-value',  # http://crbug.com/505296 | 
| 5765                   '-Wno-unknown-pragmas',  # http://crbug.com/505314 | 5765                   '-Wno-unknown-pragmas',  # http://crbug.com/505314 | 
| 5766                   '-Wno-unused-value',  # http://crbug.com/505318 | 5766                   # Disable unused-value (crbug.com/505318) except | 
|  | 5767                   # -Wunused-result. | 
|  | 5768                   '-Wno-unused-value', | 
|  | 5769                   '-Wunused-result', | 
| 5767                 ], | 5770                 ], | 
| 5768               }, | 5771               }, | 
| 5769             }], | 5772             }], | 
| 5770             ['clang==1 and clang_use_chrome_plugins==1', { | 5773             ['clang==1 and clang_use_chrome_plugins==1', { | 
| 5771               'VCCLCompilerTool': { | 5774               'VCCLCompilerTool': { | 
| 5772                 'AdditionalOptions': [ | 5775                 'AdditionalOptions': [ | 
| 5773                   '<@(clang_chrome_plugins_flags)', | 5776                   '<@(clang_chrome_plugins_flags)', | 
| 5774                 ], | 5777                 ], | 
| 5775               }, | 5778               }, | 
| 5776             }], | 5779             }], | 
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 6277     # settings in target dicts.  SYMROOT is a special case, because many other | 6280     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 6278     # Xcode variables depend on it, including variables such as | 6281     # Xcode variables depend on it, including variables such as | 
| 6279     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 6282     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 6280     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6283     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 6281     # files to appear (when present) in the UI as actual files and not red | 6284     # files to appear (when present) in the UI as actual files and not red | 
| 6282     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6285     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 6283     # and therefore SYMROOT, needs to be set at the project level. | 6286     # and therefore SYMROOT, needs to be set at the project level. | 
| 6284     'SYMROOT': '<(DEPTH)/xcodebuild', | 6287     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 6285   }, | 6288   }, | 
| 6286 } | 6289 } | 
| OLD | NEW | 
|---|