Chromium Code Reviews| 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 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 703 # but that doesn't work as we'd like. | 703 # but that doesn't work as we'd like. |
| 704 'msvs_debug_link_incremental%': '2', | 704 'msvs_debug_link_incremental%': '2', |
| 705 | 705 |
| 706 # Needed for some of the largest modules. | 706 # Needed for some of the largest modules. |
| 707 'msvs_debug_link_nonincremental%': '1', | 707 'msvs_debug_link_nonincremental%': '1', |
| 708 | 708 |
| 709 # Turns on Use Library Dependency Inputs for linking chrome.dll on Windows | 709 # Turns on Use Library Dependency Inputs for linking chrome.dll on Windows |
| 710 # to get incremental linking to be faster in debug builds. | 710 # to get incremental linking to be faster in debug builds. |
| 711 'incremental_chrome_dll%': '0', | 711 'incremental_chrome_dll%': '0', |
| 712 | 712 |
| 713 # The default settings for third party code for treating | |
| 714 # warnings-as-errors. Ideally, this would not be required, however there | |
| 715 # is some third party code that takes a long time to fix/roll. So, this | |
| 716 # flag allows us to have warnings as errors in general to prevent | |
| 717 # regressions in most modules, while working on the bits that are | |
| 718 # remaining. | |
| 719 'win_third_party_warn_as_error%': 'true', | |
| 720 | |
| 713 # This is the location of the sandbox binary. Chrome looks for this before | 721 # This is the location of the sandbox binary. Chrome looks for this before |
| 714 # running the zygote process. If found, and SUID, it will be used to | 722 # running the zygote process. If found, and SUID, it will be used to |
| 715 # sandbox the zygote process and, thus, all renderer processes. | 723 # sandbox the zygote process and, thus, all renderer processes. |
| 716 'linux_sandbox_path%': '', | 724 'linux_sandbox_path%': '', |
| 717 | 725 |
| 718 # Set this to true to enable SELinux support. | 726 # Set this to true to enable SELinux support. |
| 719 'selinux%': 0, | 727 'selinux%': 0, |
| 720 | 728 |
| 721 # Clang stuff. | 729 # Clang stuff. |
| 722 'clang%': '<(clang)', | 730 'clang%': '<(clang)', |
| (...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1670 'defines': [ | 1678 'defines': [ |
| 1671 '_CRT_SECURE_NO_DEPRECATE', | 1679 '_CRT_SECURE_NO_DEPRECATE', |
| 1672 '_CRT_NONSTDC_NO_WARNINGS', | 1680 '_CRT_NONSTDC_NO_WARNINGS', |
| 1673 '_CRT_NONSTDC_NO_DEPRECATE', | 1681 '_CRT_NONSTDC_NO_DEPRECATE', |
| 1674 '_SCL_SECURE_NO_DEPRECATE', | 1682 '_SCL_SECURE_NO_DEPRECATE', |
| 1675 ], | 1683 ], |
| 1676 'msvs_disabled_warnings': [4800], | 1684 'msvs_disabled_warnings': [4800], |
| 1677 'msvs_settings': { | 1685 'msvs_settings': { |
| 1678 'VCCLCompilerTool': { | 1686 'VCCLCompilerTool': { |
| 1679 'WarningLevel': '3', | 1687 'WarningLevel': '3', |
| 1680 'WarnAsError': 'false', # TODO(maruel): Enable it. | 1688 'WarnAsError': '<(win_third_party_warn_as_error)', |
| 1681 'Detect64BitPortabilityProblems': 'false', | 1689 'Detect64BitPortabilityProblems': 'false', |
| 1682 }, | 1690 }, |
| 1683 }, | 1691 }, |
| 1692 'conditions': [ | |
|
scottmg
2012/08/24 18:44:30
Only difference from previous CL is this block.
| |
| 1693 ['buildtype=="Official"', { | |
| 1694 'msvs_settings': { | |
| 1695 'VCCLCompilerTool': { 'WarnAsError': 'false' }, | |
| 1696 } | |
| 1697 }], | |
| 1698 ], | |
| 1684 }], | 1699 }], |
| 1685 # TODO(darin): Unfortunately, some third_party code depends on base/ | 1700 # TODO(darin): Unfortunately, some third_party code depends on base/ |
| 1686 [ 'OS=="win" and component=="shared_library"', { | 1701 [ 'OS=="win" and component=="shared_library"', { |
| 1687 'msvs_disabled_warnings': [ | 1702 'msvs_disabled_warnings': [ |
| 1688 4251, # class 'std::xx' needs to have dll-interface. | 1703 4251, # class 'std::xx' needs to have dll-interface. |
| 1689 ], | 1704 ], |
| 1690 }], | 1705 }], |
| 1691 [ 'OS=="mac" or OS=="ios"', { | 1706 [ 'OS=="mac" or OS=="ios"', { |
| 1692 'xcode_settings': { | 1707 'xcode_settings': { |
| 1693 'WARNING_CFLAGS!': ['-Wall', '-Wextra'], | 1708 'WARNING_CFLAGS!': ['-Wall', '-Wextra'], |
| (...skipping 1701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3395 # settings in target dicts. SYMROOT is a special case, because many other | 3410 # settings in target dicts. SYMROOT is a special case, because many other |
| 3396 # Xcode variables depend on it, including variables such as | 3411 # Xcode variables depend on it, including variables such as |
| 3397 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3412 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3398 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3413 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3399 # files to appear (when present) in the UI as actual files and not red | 3414 # files to appear (when present) in the UI as actual files and not red |
| 3400 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3415 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3401 # and therefore SYMROOT, needs to be set at the project level. | 3416 # and therefore SYMROOT, needs to be set at the project level. |
| 3402 'SYMROOT': '<(DEPTH)/xcodebuild', | 3417 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3403 }, | 3418 }, |
| 3404 } | 3419 } |
| OLD | NEW |