| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 106 | 106 | 
| 107     # The system root for cross-compiles. Default: none. | 107     # The system root for cross-compiles. Default: none. | 
| 108     'sysroot%': '', | 108     'sysroot%': '', | 
| 109 | 109 | 
| 110     # This is the location of the sandbox binary. Chrome looks for this before | 110     # This is the location of the sandbox binary. Chrome looks for this before | 
| 111     # running the zygote process. If found, and SUID, it will be used to | 111     # running the zygote process. If found, and SUID, it will be used to | 
| 112     # sandbox the zygote process and, thus, all renderer processes. | 112     # sandbox the zygote process and, thus, all renderer processes. | 
| 113     'linux_sandbox_path%': '', | 113     'linux_sandbox_path%': '', | 
| 114 | 114 | 
| 115     'conditions': [ | 115     'conditions': [ | 
| 116       ['OS=="linux"', { | 116       ['OS=="linux" or OS=="freebsd"', { | 
| 117         'conditions': [ | 117         'conditions': [ | 
| 118           ['branding=="Chrome" or linux_chromium_breakpad==1', { | 118           ['branding=="Chrome" or linux_chromium_breakpad==1', { | 
| 119             'linux_breakpad%': 1, | 119             'linux_breakpad%': 1, | 
| 120           }, { | 120           }, { | 
| 121             'linux_breakpad%': 0, | 121             'linux_breakpad%': 0, | 
| 122           }], | 122           }], | 
| 123         ], | 123         ], | 
| 124       }],  # OS=="linux" | 124       }],  # OS=="linux" | 
| 125       ['OS=="mac"', { | 125       ['OS=="mac"', { | 
| 126         'conditions': [ | 126         'conditions': [ | 
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 342               'VCLinkerTool': { | 342               'VCLinkerTool': { | 
| 343                 'LinkIncremental': '1', | 343                 'LinkIncremental': '1', | 
| 344               }, | 344               }, | 
| 345             }, | 345             }, | 
| 346           }, | 346           }, | 
| 347         }], | 347         }], | 
| 348       ], | 348       ], | 
| 349     }, | 349     }, | 
| 350   }, | 350   }, | 
| 351   'conditions': [ | 351   'conditions': [ | 
| 352     ['OS=="linux"', { | 352     ['OS=="linux" or OS=="freebsd"', { | 
| 353       'target_defaults': { | 353       'target_defaults': { | 
| 354         # Enable -Werror by default, but put it in a variable so it can | 354         # Enable -Werror by default, but put it in a variable so it can | 
| 355         # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 355         # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 
| 356         'variables': { | 356         'variables': { | 
| 357           'werror%': '-Werror', | 357           'werror%': '-Werror', | 
| 358           'no_strict_aliasing%': 0, | 358           'no_strict_aliasing%': 0, | 
| 359         }, | 359         }, | 
| 360         'cflags': [ | 360         'cflags': [ | 
| 361           '<(werror)',  # See note above about the werror variable. | 361           '<(werror)',  # See note above about the werror variable. | 
| 362           '-pthread', | 362           '-pthread', | 
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 554               '-fno-strict-aliasing', | 554               '-fno-strict-aliasing', | 
| 555             ], | 555             ], | 
| 556           }], | 556           }], | 
| 557           ['linux_breakpad==1', { | 557           ['linux_breakpad==1', { | 
| 558             'cflags': [ '-gstabs' ], | 558             'cflags': [ '-gstabs' ], | 
| 559             'defines': ['USE_LINUX_BREAKPAD'], | 559             'defines': ['USE_LINUX_BREAKPAD'], | 
| 560           }], | 560           }], | 
| 561         ], | 561         ], | 
| 562       }, | 562       }, | 
| 563     }], | 563     }], | 
|  | 564     # Note that most FreeBSD options are set above, with Linux | 
|  | 565     ['OS=="freebsd"', { | 
|  | 566       'target_defaults': { | 
|  | 567         'ldflags': [ | 
|  | 568           '-Wl,--no-keep-memory', | 
|  | 569         ], | 
|  | 570       }, | 
|  | 571     }], | 
| 564     ['OS=="mac"', { | 572     ['OS=="mac"', { | 
| 565       'target_defaults': { | 573       'target_defaults': { | 
| 566         'variables': { | 574         'variables': { | 
| 567           # This should be 'mac_real_dsym%', but there seems to be a bug | 575           # This should be 'mac_real_dsym%', but there seems to be a bug | 
| 568           # with % in variables that are intended to be set to different | 576           # with % in variables that are intended to be set to different | 
| 569           # values in different targets, like this one. | 577           # values in different targets, like this one. | 
| 570           'mac_real_dsym': 0,  # Fake .dSYMs are fine in most cases. | 578           'mac_real_dsym': 0,  # Fake .dSYMs are fine in most cases. | 
| 571         }, | 579         }, | 
| 572         'mac_bundle': 0, | 580         'mac_bundle': 0, | 
| 573         'xcode_settings': { | 581         'xcode_settings': { | 
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 777     # settings in target dicts.  SYMROOT is a special case, because many other | 785     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 778     # Xcode variables depend on it, including variables such as | 786     # Xcode variables depend on it, including variables such as | 
| 779     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 787     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 780     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 788     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 781     # files to appear (when present) in the UI as actual files and not red | 789     # files to appear (when present) in the UI as actual files and not red | 
| 782     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 790     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 783     # and therefore SYMROOT, needs to be set at the project level. | 791     # and therefore SYMROOT, needs to be set at the project level. | 
| 784     'SYMROOT': '<(DEPTH)/xcodebuild', | 792     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 785   }, | 793   }, | 
| 786 } | 794 } | 
| OLD | NEW | 
|---|