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

Side by Side Diff: build/common.gypi

Issue 10423010: Applying release settings to Release_Base rather than just Release. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« 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 1790 matching lines...) Expand 10 before | Expand all | Expand 10 after
1801 'LinkIncremental': '1', 1801 'LinkIncremental': '1',
1802 # This corresponds to the /PROFILE flag which ensures the PDB 1802 # This corresponds to the /PROFILE flag which ensures the PDB
1803 # file contains FIXUP information (growing the PDB file by about 1803 # file contains FIXUP information (growing the PDB file by about
1804 # 5%) but does not otherwise alter the output binary. This 1804 # 5%) but does not otherwise alter the output binary. This
1805 # information is used by the Syzygy optimization tool when 1805 # information is used by the Syzygy optimization tool when
1806 # decomposing the release image. 1806 # decomposing the release image.
1807 'Profile': 'true', 1807 'Profile': 'true',
1808 }, 1808 },
1809 }, 1809 },
1810 'conditions': [ 1810 'conditions': [
1811 ['msvs_use_common_release', {
1812 'includes': ['release.gypi'],
1813 }],
1811 ['release_valgrind_build==0', { 1814 ['release_valgrind_build==0', {
1812 'defines': [ 1815 'defines': [
1813 'NVALGRIND', 1816 'NVALGRIND',
1814 'DYNAMIC_ANNOTATIONS_ENABLED=0', 1817 'DYNAMIC_ANNOTATIONS_ENABLED=0',
1815 ], 1818 ],
1816 }, { 1819 }, {
1817 'defines': [ 1820 'defines': [
1818 'DYNAMIC_ANNOTATIONS_ENABLED=1', 1821 'DYNAMIC_ANNOTATIONS_ENABLED=1',
1819 'WTF_USE_DYNAMIC_ANNOTATIONS=1', 1822 'WTF_USE_DYNAMIC_ANNOTATIONS=1',
1820 ], 1823 ],
1821 }], 1824 }],
1822 ['win_use_allocator_shim==0', { 1825 ['win_use_allocator_shim==0', {
1823 'defines': ['NO_TCMALLOC'], 1826 'defines': ['NO_TCMALLOC'],
1824 }], 1827 }],
1825 ['OS=="linux"', { 1828 ['OS=="linux"', {
1826 'cflags': [ 1829 'cflags': [
1827 '<@(release_extra_cflags)', 1830 '<@(release_extra_cflags)',
1828 ], 1831 ],
1829 }], 1832 }],
1830 ], 1833 ],
1831 }, 1834 },
1832 # 1835 #
1833 # Concrete configurations 1836 # Concrete configurations
1834 # 1837 #
1835 'Debug': { 1838 'Debug': {
1836 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], 1839 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
1837 }, 1840 },
1838 'Release': { 1841 'Release': {
1839 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'], 1842 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
1840 'conditions': [
1841 ['msvs_use_common_release', {
1842 'includes': ['release.gypi'],
1843 }],
1844 ]
1845 }, 1843 },
1846 'conditions': [ 1844 'conditions': [
1847 [ 'OS=="win"', { 1845 [ 'OS=="win"', {
1848 # TODO(bradnelson): add a gyp mechanism to make this more graceful. 1846 # TODO(bradnelson): add a gyp mechanism to make this more graceful.
1849 'Debug_x64': { 1847 'Debug_x64': {
1850 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], 1848 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
1851 }, 1849 },
1852 'Release_x64': { 1850 'Release_x64': {
1853 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], 1851 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
1854 }, 1852 },
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
3106 # settings in target dicts. SYMROOT is a special case, because many other 3104 # settings in target dicts. SYMROOT is a special case, because many other
3107 # Xcode variables depend on it, including variables such as 3105 # Xcode variables depend on it, including variables such as
3108 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3106 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3109 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3107 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3110 # files to appear (when present) in the UI as actual files and not red 3108 # files to appear (when present) in the UI as actual files and not red
3111 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3109 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3112 # and therefore SYMROOT, needs to be set at the project level. 3110 # and therefore SYMROOT, needs to be set at the project level.
3113 'SYMROOT': '<(DEPTH)/xcodebuild', 3111 'SYMROOT': '<(DEPTH)/xcodebuild',
3114 }, 3112 },
3115 } 3113 }
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