| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| 8 # code, as opposed to external code. This variable is used to control | 8 # code, as opposed to external code. This variable is used to control |
| 9 # such things as the set of warnings to enable, and whether warnings are | 9 # such things as the set of warnings to enable, and whether warnings are |
| 10 # treated as errors. | 10 # treated as errors. |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 ], | 166 ], |
| 167 }], | 167 }], |
| 168 ], | 168 ], |
| 169 }, | 169 }, |
| 170 'target_defaults': { | 170 'target_defaults': { |
| 171 'variables': { | 171 'variables': { |
| 172 'mac_release_optimization%': '3', # Use -O3 unless overridden | 172 'mac_release_optimization%': '3', # Use -O3 unless overridden |
| 173 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 173 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
| 174 'release_extra_cflags%': '', | 174 'release_extra_cflags%': '', |
| 175 'debug_extra_cflags%': '', | 175 'debug_extra_cflags%': '', |
| 176 'release_valgrind_build%': 0, |
| 176 }, | 177 }, |
| 177 'conditions': [ | 178 'conditions': [ |
| 178 ['branding=="Chrome"', { | 179 ['branding=="Chrome"', { |
| 179 'defines': ['GOOGLE_CHROME_BUILD'], | 180 'defines': ['GOOGLE_CHROME_BUILD'], |
| 180 }, { # else: branding!="Chrome" | 181 }, { # else: branding!="Chrome" |
| 181 'defines': ['CHROMIUM_BUILD'], | 182 'defines': ['CHROMIUM_BUILD'], |
| 182 }], | 183 }], |
| 183 ['experimental_build_define', { | 184 ['experimental_build_define', { |
| 184 'defines': ['CHROME_EXP_BUILD'], | 185 'defines': ['CHROME_EXP_BUILD'], |
| 185 }], | 186 }], |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 'Release': { | 275 'Release': { |
| 275 'defines': [ | 276 'defines': [ |
| 276 'NDEBUG', | 277 'NDEBUG', |
| 277 ], | 278 ], |
| 278 'xcode_settings': { | 279 'xcode_settings': { |
| 279 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip | 280 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip |
| 280 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', | 281 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', |
| 281 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], | 282 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], |
| 282 }, | 283 }, |
| 283 'conditions': [ | 284 'conditions': [ |
| 285 ['release_valgrind_build==0', { |
| 286 'defines': ['NVALGRIND'], |
| 287 }], |
| 284 [ 'OS=="win" and msvs_use_common_release', { | 288 [ 'OS=="win" and msvs_use_common_release', { |
| 285 'msvs_props': ['release.vsprops'], | 289 'msvs_props': ['release.vsprops'], |
| 286 }], | 290 }], |
| 287 [ 'OS=="win"', { | 291 [ 'OS=="win"', { |
| 288 'configuration_platform': 'Win32', | 292 'configuration_platform': 'Win32', |
| 289 'msvs_configuration_attributes': { | 293 'msvs_configuration_attributes': { |
| 290 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 294 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
| 291 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 295 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| 292 'CharacterSet': '1', | 296 'CharacterSet': '1', |
| 293 }, | 297 }, |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 # settings in target dicts. SYMROOT is a special case, because many other | 793 # settings in target dicts. SYMROOT is a special case, because many other |
| 790 # Xcode variables depend on it, including variables such as | 794 # Xcode variables depend on it, including variables such as |
| 791 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 795 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 792 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 796 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 793 # files to appear (when present) in the UI as actual files and not red | 797 # files to appear (when present) in the UI as actual files and not red |
| 794 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 798 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 795 # and therefore SYMROOT, needs to be set at the project level. | 799 # and therefore SYMROOT, needs to be set at the project level. |
| 796 'SYMROOT': '<(DEPTH)/xcodebuild', | 800 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 797 }, | 801 }, |
| 798 } | 802 } |
| OLD | NEW |