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

Side by Side Diff: build/common.gypi

Issue 6969045: Simplify the disable_pie logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 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 | chrome/chrome_exe.gypi » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 # P2P APIs are compiled in by default. Set to 0 to disable. 132 # P2P APIs are compiled in by default. Set to 0 to disable.
133 # Also note that this should be enabled for remoting to compile. 133 # Also note that this should be enabled for remoting to compile.
134 'p2p_apis%': 1, 134 'p2p_apis%': 1,
135 135
136 # If this is set, the clang plugins used on the buildbot will be used. 136 # If this is set, the clang plugins used on the buildbot will be used.
137 # Run tools/clang/scripts/update.sh to make sure they are compiled. 137 # Run tools/clang/scripts/update.sh to make sure they are compiled.
138 # This causes 'clang_chrome_plugins_flags' to be set. 138 # This causes 'clang_chrome_plugins_flags' to be set.
139 # Has no effect if 'clang' is not set as well. 139 # Has no effect if 'clang' is not set as well.
140 'clang_use_chrome_plugins%': 0, 140 'clang_use_chrome_plugins%': 0,
141 141
142 # Allow a user to link Chromium as a non-position independent executable.
143 'disable_pie%': 0,
144
145 'conditions': [ 142 'conditions': [
146 # A flag to enable or disable our compile-time dependency 143 # A flag to enable or disable our compile-time dependency
147 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 144 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
148 # support will be available. This option is useful 145 # support will be available. This option is useful
149 # for Linux distributions. 146 # for Linux distributions.
150 ['chromeos==1', { 147 ['chromeos==1', {
151 'use_gnome_keyring%': 0, 148 'use_gnome_keyring%': 0,
152 }, { 149 }, {
153 'use_gnome_keyring%': 1, 150 'use_gnome_keyring%': 1,
154 }], 151 }],
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 'arm_neon%': '<(arm_neon)', 198 'arm_neon%': '<(arm_neon)',
202 'sysroot%': '<(sysroot)', 199 'sysroot%': '<(sysroot)',
203 'disable_sse2%': '<(disable_sse2)', 200 'disable_sse2%': '<(disable_sse2)',
204 'library%': '<(library)', 201 'library%': '<(library)',
205 'component%': '<(component)', 202 'component%': '<(component)',
206 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 203 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
207 'use_third_party_translations%': '<(use_third_party_translations)', 204 'use_third_party_translations%': '<(use_third_party_translations)',
208 'remoting%': '<(remoting)', 205 'remoting%': '<(remoting)',
209 'p2p_apis%': '<(p2p_apis)', 206 'p2p_apis%': '<(p2p_apis)',
210 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 207 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
211 'disable_pie%': '<(disable_pie)',
212 208
213 # The release channel that this build targets. This is used to restrict 209 # The release channel that this build targets. This is used to restrict
214 # channel-specific build options, like which installer packages to create. 210 # channel-specific build options, like which installer packages to create.
215 # The default is 'all', which does no channel-specific filtering. 211 # The default is 'all', which does no channel-specific filtering.
216 'channel%': 'all', 212 'channel%': 'all',
217 213
218 # Override chromium_mac_pch and set it to 0 to suppress the use of 214 # Override chromium_mac_pch and set it to 0 to suppress the use of
219 # precompiled headers on the Mac. Prefix header injection may still be 215 # precompiled headers on the Mac. Prefix header injection may still be
220 # used, but prefix headers will not be precompiled. This is useful when 216 # used, but prefix headers will not be precompiled. This is useful when
221 # using distcc to distribute a build to compile slaves that don't 217 # using distcc to distribute a build to compile slaves that don't
(...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1715 # and therefore SYMROOT, needs to be set at the project level. 1711 # and therefore SYMROOT, needs to be set at the project level.
1716 'SYMROOT': '<(DEPTH)/xcodebuild', 1712 'SYMROOT': '<(DEPTH)/xcodebuild',
1717 }, 1713 },
1718 } 1714 }
1719 1715
1720 # Local Variables: 1716 # Local Variables:
1721 # tab-width:2 1717 # tab-width:2
1722 # indent-tabs-mode:nil 1718 # indent-tabs-mode:nil
1723 # End: 1719 # End:
1724 # vim: set expandtab tabstop=2 shiftwidth=2: 1720 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698