Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: build/common.gypi

Issue 10456020: Added release_extra_cflags only to the target compiles. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed paste error Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1739 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 # Note that this is a three-way bool, where 0 means to pick up 1750 # Note that this is a three-way bool, where 0 means to pick up
1751 # the default setting, 1 is off and 2 is on. 1751 # the default setting, 1 is off and 2 is on.
1752 'RandomizedBaseAddress': 1, 1752 'RandomizedBaseAddress': 1,
1753 }, 1753 },
1754 'VCResourceCompilerTool': { 1754 'VCResourceCompilerTool': {
1755 'PreprocessorDefinitions': ['_DEBUG'], 1755 'PreprocessorDefinitions': ['_DEBUG'],
1756 }, 1756 },
1757 }, 1757 },
1758 'conditions': [ 1758 'conditions': [
1759 ['OS=="linux"', { 1759 ['OS=="linux"', {
1760 'cflags': [ 1760 'target_conditions': [
1761 '<@(debug_extra_cflags)', 1761 ['_toolset=="target"', {
1762 'cflags': [
1763 '<@(debug_extra_cflags)',
1764 ],
1765 }],
1762 ], 1766 ],
1763 }], 1767 }],
1764 ['release_valgrind_build==0', { 1768 ['release_valgrind_build==0', {
1765 'xcode_settings': { 1769 'xcode_settings': {
1766 'OTHER_CFLAGS': [ 1770 'OTHER_CFLAGS': [
1767 '-fstack-protector-all', # Implies -fstack-protector 1771 '-fstack-protector-all', # Implies -fstack-protector
1768 ], 1772 ],
1769 }, 1773 },
1770 }], 1774 }],
1771 ], 1775 ],
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
1842 }, { 1846 }, {
1843 'defines': [ 1847 'defines': [
1844 'DYNAMIC_ANNOTATIONS_ENABLED=1', 1848 'DYNAMIC_ANNOTATIONS_ENABLED=1',
1845 'WTF_USE_DYNAMIC_ANNOTATIONS=1', 1849 'WTF_USE_DYNAMIC_ANNOTATIONS=1',
1846 ], 1850 ],
1847 }], 1851 }],
1848 ['win_use_allocator_shim==0', { 1852 ['win_use_allocator_shim==0', {
1849 'defines': ['NO_TCMALLOC'], 1853 'defines': ['NO_TCMALLOC'],
1850 }], 1854 }],
1851 ['OS=="linux"', { 1855 ['OS=="linux"', {
1852 'cflags': [ 1856 'target_conditions': [
1853 '<@(release_extra_cflags)', 1857 ['_toolset=="target"', {
1858 'cflags': [
1859 '<@(release_extra_cflags)',
1860 ],
1861 }],
1854 ], 1862 ],
1855 }], 1863 }],
1856 ], 1864 ],
1857 }, 1865 },
1858 # 1866 #
1859 # Concrete configurations 1867 # Concrete configurations
1860 # 1868 #
1861 'Debug': { 1869 'Debug': {
1862 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], 1870 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
1863 }, 1871 },
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
3127 # settings in target dicts. SYMROOT is a special case, because many other 3135 # settings in target dicts. SYMROOT is a special case, because many other
3128 # Xcode variables depend on it, including variables such as 3136 # Xcode variables depend on it, including variables such as
3129 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3137 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3130 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3138 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3131 # files to appear (when present) in the UI as actual files and not red 3139 # files to appear (when present) in the UI as actual files and not red
3132 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3140 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3133 # and therefore SYMROOT, needs to be set at the project level. 3141 # and therefore SYMROOT, needs to be set at the project level.
3134 'SYMROOT': '<(DEPTH)/xcodebuild', 3142 'SYMROOT': '<(DEPTH)/xcodebuild',
3135 }, 3143 },
3136 } 3144 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698