| 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 1642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1653 }], | 1653 }], |
| 1654 ], | 1654 ], |
| 1655 }, | 1655 }, |
| 1656 }, | 1656 }, |
| 1657 'conditions': [ | 1657 'conditions': [ |
| 1658 ['os_posix==1 and OS!="mac"', { | 1658 ['os_posix==1 and OS!="mac"', { |
| 1659 'target_defaults': { | 1659 'target_defaults': { |
| 1660 # Enable -Werror by default, but put it in a variable so it can | 1660 # Enable -Werror by default, but put it in a variable so it can |
| 1661 # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 1661 # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
| 1662 'variables': { | 1662 'variables': { |
| 1663 # Use -fno-strict-aliasing, see http://crbug.com/32204 | |
| 1664 'no_strict_aliasing%': 1, | |
| 1665 'conditions': [ | 1663 'conditions': [ |
| 1666 ['OS=="linux"', { | 1664 ['OS=="linux"', { |
| 1667 'werror%': '-Werror', | 1665 'werror%': '-Werror', |
| 1668 }, { # turn off -Werror on other Unices | 1666 }, { # turn off -Werror on other Unices |
| 1669 'werror%': '', | 1667 'werror%': '', |
| 1670 }], | 1668 }], |
| 1671 ], | 1669 ], |
| 1672 }, | 1670 }, |
| 1673 'cflags': [ | 1671 'cflags': [ |
| 1674 '<(werror)', # See note above about the werror variable. | 1672 '<(werror)', # See note above about the werror variable. |
| 1675 '-pthread', | 1673 '-pthread', |
| 1676 '-fno-exceptions', | 1674 '-fno-exceptions', |
| 1675 '-fno-strict-aliasing', # See http://crbug.com/32204 |
| 1677 '-Wall', | 1676 '-Wall', |
| 1678 # TODO(evan): turn this back on once all the builds work. | 1677 # TODO(evan): turn this back on once all the builds work. |
| 1679 # '-Wextra', | 1678 # '-Wextra', |
| 1680 # Don't warn about unused function params. We use those everywhere. | 1679 # Don't warn about unused function params. We use those everywhere. |
| 1681 '-Wno-unused-parameter', | 1680 '-Wno-unused-parameter', |
| 1682 # Don't warn about the "struct foo f = {0};" initialization pattern. | 1681 # Don't warn about the "struct foo f = {0};" initialization pattern. |
| 1683 '-Wno-missing-field-initializers', | 1682 '-Wno-missing-field-initializers', |
| 1684 '-D_FILE_OFFSET_BITS=64', | 1683 '-D_FILE_OFFSET_BITS=64', |
| 1685 # Don't export any symbols (for example, to plugins we dlopen()). | 1684 # Don't export any symbols (for example, to plugins we dlopen()). |
| 1686 # Note: this is *required* to make some plugins work. | 1685 # Note: this is *required* to make some plugins work. |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2040 '-fno-omit-frame-pointer', | 2039 '-fno-omit-frame-pointer', |
| 2041 '-w', | 2040 '-w', |
| 2042 ], | 2041 ], |
| 2043 'ldflags': [ | 2042 'ldflags': [ |
| 2044 '-faddress-sanitizer', | 2043 '-faddress-sanitizer', |
| 2045 ], | 2044 ], |
| 2046 'defines': [ | 2045 'defines': [ |
| 2047 'ADDRESS_SANITIZER', | 2046 'ADDRESS_SANITIZER', |
| 2048 ], | 2047 ], |
| 2049 }], | 2048 }], |
| 2050 ['no_strict_aliasing==1', { | |
| 2051 'cflags': [ | |
| 2052 '-fno-strict-aliasing', | |
| 2053 ], | |
| 2054 }], | |
| 2055 ['linux_breakpad==1', { | 2049 ['linux_breakpad==1', { |
| 2056 'cflags': [ '-g' ], | 2050 'cflags': [ '-g' ], |
| 2057 'defines': ['USE_LINUX_BREAKPAD'], | 2051 'defines': ['USE_LINUX_BREAKPAD'], |
| 2058 }], | 2052 }], |
| 2059 ['linux_use_heapchecker==1', { | 2053 ['linux_use_heapchecker==1', { |
| 2060 'variables': {'linux_use_tcmalloc%': 1}, | 2054 'variables': {'linux_use_tcmalloc%': 1}, |
| 2061 }], | 2055 }], |
| 2062 ['linux_use_tcmalloc==0', { | 2056 ['linux_use_tcmalloc==0', { |
| 2063 'defines': ['NO_TCMALLOC'], | 2057 'defines': ['NO_TCMALLOC'], |
| 2064 }], | 2058 }], |
| (...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2817 # settings in target dicts. SYMROOT is a special case, because many other | 2811 # settings in target dicts. SYMROOT is a special case, because many other |
| 2818 # Xcode variables depend on it, including variables such as | 2812 # Xcode variables depend on it, including variables such as |
| 2819 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2813 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2820 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2814 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2821 # files to appear (when present) in the UI as actual files and not red | 2815 # files to appear (when present) in the UI as actual files and not red |
| 2822 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2816 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2823 # and therefore SYMROOT, needs to be set at the project level. | 2817 # and therefore SYMROOT, needs to be set at the project level. |
| 2824 'SYMROOT': '<(DEPTH)/xcodebuild', | 2818 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2825 }, | 2819 }, |
| 2826 } | 2820 } |
| OLD | NEW |