| 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 3192 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3203               # TODO(darin): Unfortunately, some third_party code depends on bas
      e. | 3203               # TODO(darin): Unfortunately, some third_party code depends on bas
      e. | 
| 3204                 'msvs_disabled_warnings': [ | 3204                 'msvs_disabled_warnings': [ | 
| 3205                   4251,  # class 'std::xx' needs to have dll-interface. | 3205                   4251,  # class 'std::xx' needs to have dll-interface. | 
| 3206                  ], | 3206                  ], | 
| 3207               }], | 3207               }], | 
| 3208             ], | 3208             ], | 
| 3209           }], | 3209           }], | 
| 3210 | 3210 | 
| 3211           [ 'OS=="mac" or OS=="ios"', { | 3211           [ 'OS=="mac" or OS=="ios"', { | 
| 3212             'xcode_settings': { | 3212             'xcode_settings': { | 
| 3213               'WARNING_CFLAGS!': ['-Wall', '-Wextra'], | 3213               'WARNING_CFLAGS!': ['-Wextra'], | 
| 3214             }, | 3214             }, | 
| 3215             'conditions': [ | 3215             'conditions': [ | 
| 3216               ['buildtype=="Official"', { | 3216               ['buildtype=="Official"', { | 
| 3217                 'xcode_settings': { | 3217                 'xcode_settings': { | 
| 3218                   'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',    # -Werror | 3218                   'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',    # -Werror | 
| 3219                 }, | 3219                 }, | 
| 3220               }], | 3220               }], | 
| 3221             ], | 3221             ], | 
| 3222           }], | 3222           }], | 
| 3223           [ 'OS=="ios"', { | 3223           [ 'OS=="ios"', { | 
| (...skipping 3200 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 6424     # settings in target dicts.  SYMROOT is a special case, because many other | 6424     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 6425     # Xcode variables depend on it, including variables such as | 6425     # Xcode variables depend on it, including variables such as | 
| 6426     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 6426     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 6427     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6427     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 6428     # files to appear (when present) in the UI as actual files and not red | 6428     # files to appear (when present) in the UI as actual files and not red | 
| 6429     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6429     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 6430     # and therefore SYMROOT, needs to be set at the project level. | 6430     # and therefore SYMROOT, needs to be set at the project level. | 
| 6431     'SYMROOT': '<(DEPTH)/xcodebuild', | 6431     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 6432   }, | 6432   }, | 
| 6433 } | 6433 } | 
| OLD | NEW | 
|---|