| 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 2881 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2892                 ], | 2892                 ], | 
| 2893               }], | 2893               }], | 
| 2894             ], | 2894             ], | 
| 2895           }], | 2895           }], | 
| 2896           ['linux_breakpad==1', { | 2896           ['linux_breakpad==1', { | 
| 2897             'defines': ['USE_LINUX_BREAKPAD'], | 2897             'defines': ['USE_LINUX_BREAKPAD'], | 
| 2898           }], | 2898           }], | 
| 2899           ['linux_dump_symbols==1', { | 2899           ['linux_dump_symbols==1', { | 
| 2900             'cflags': [ '-g' ], | 2900             'cflags': [ '-g' ], | 
| 2901             'conditions': [ | 2901             'conditions': [ | 
| 2902               ['target_arch=="ia32"', { | 2902               ['target_arch=="ia32" and OS!="android"', { | 
| 2903                 'target_conditions': [ | 2903                 'target_conditions': [ | 
| 2904                   ['_toolset=="target"', { | 2904                   ['_toolset=="target"', { | 
| 2905                     'ldflags': [ | 2905                     'ldflags': [ | 
| 2906                       # Workaround for linker OOM. http://crbug.com/160253. | 2906                       # Workaround for linker OOM. http://crbug.com/160253. | 
| 2907                       '-Wl,--no-keep-files-mapped', | 2907                       '-Wl,--no-keep-files-mapped', | 
| 2908                     ], | 2908                     ], | 
| 2909                   }], | 2909                   }], | 
| 2910                 ], | 2910                 ], | 
| 2911               }], | 2911               }], | 
| 2912             ], | 2912             ], | 
| (...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4051     # settings in target dicts.  SYMROOT is a special case, because many other | 4051     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 4052     # Xcode variables depend on it, including variables such as | 4052     # Xcode variables depend on it, including variables such as | 
| 4053     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 4053     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 4054     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4054     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 4055     # files to appear (when present) in the UI as actual files and not red | 4055     # files to appear (when present) in the UI as actual files and not red | 
| 4056     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4056     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 4057     # and therefore SYMROOT, needs to be set at the project level. | 4057     # and therefore SYMROOT, needs to be set at the project level. | 
| 4058     'SYMROOT': '<(DEPTH)/xcodebuild', | 4058     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 4059   }, | 4059   }, | 
| 4060 } | 4060 } | 
| OLD | NEW | 
|---|