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

Side by Side Diff: build/common.gypi

Issue 7240019: Now try and make -pie stick for 32-bit Linux too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 # Configuration policy is enabled by default. Set to 0 to disable. 139 # Configuration policy is enabled by default. Set to 0 to disable.
140 'configuration_policy%': 1, 140 'configuration_policy%': 1,
141 141
142 # If this is set, the clang plugins used on the buildbot will be used. 142 # If this is set, the clang plugins used on the buildbot will be used.
143 # Run tools/clang/scripts/update.sh to make sure they are compiled. 143 # Run tools/clang/scripts/update.sh to make sure they are compiled.
144 # This causes 'clang_chrome_plugins_flags' to be set. 144 # This causes 'clang_chrome_plugins_flags' to be set.
145 # Has no effect if 'clang' is not set as well. 145 # Has no effect if 'clang' is not set as well.
146 'clang_use_chrome_plugins%': 0, 146 'clang_use_chrome_plugins%': 0,
147 147
148 # Set to 1 compile with -fPIC cflag on linux. This is a must for shared
149 # libraries on linux x86-64 and arm, plus ASLR.
150 'linux_fpic%': 1,
151
148 'conditions': [ 152 'conditions': [
149 # Use Skia as WebKit renderer on Mac 153 # Use Skia as WebKit renderer on Mac
150 ['OS=="mac"', { 154 ['OS=="mac"', {
151 'use_skia%': 0, 155 'use_skia%': 0,
152 }, { 156 }, {
153 'use_skia%': 1, 157 'use_skia%': 1,
154 }], 158 }],
155 159
156 # A flag for POSIX platforms 160 # A flag for POSIX platforms
157 ['OS=="win"', { 161 ['OS=="win"', {
(...skipping 14 matching lines...) Expand all
172 # A flag to enable or disable our compile-time dependency 176 # A flag to enable or disable our compile-time dependency
173 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 177 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
174 # support will be available. This option is useful 178 # support will be available. This option is useful
175 # for Linux distributions. 179 # for Linux distributions.
176 ['chromeos==1', { 180 ['chromeos==1', {
177 'use_gnome_keyring%': 0, 181 'use_gnome_keyring%': 0,
178 }, { 182 }, {
179 'use_gnome_keyring%': 1, 183 'use_gnome_keyring%': 1,
180 }], 184 }],
181 185
182 # Set to 1 compile with -fPIC cflag on linux. This is a must for shared
183 # libraries on linux x86-64 and arm.
184 ['host_arch=="ia32"', {
185 'linux_fpic%': 0,
186 }, {
187 'linux_fpic%': 1,
188 }],
189
190 ['toolkit_views==0 or OS=="mac"', { 186 ['toolkit_views==0 or OS=="mac"', {
191 # GTK+ and Mac wants Title Case strings 187 # GTK+ and Mac wants Title Case strings
192 'use_titlecase_in_grd_files%': 1, 188 'use_titlecase_in_grd_files%': 1,
193 }], 189 }],
194 190
195 # Enable some hacks to support Flapper only on Chrome OS. 191 # Enable some hacks to support Flapper only on Chrome OS.
196 ['chromeos==1', { 192 ['chromeos==1', {
197 'enable_flapper_hacks%': 1, 193 'enable_flapper_hacks%': 1,
198 }, { 194 }, {
199 'enable_flapper_hacks%': 0, 195 'enable_flapper_hacks%': 0,
(...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1776 # and therefore SYMROOT, needs to be set at the project level. 1772 # and therefore SYMROOT, needs to be set at the project level.
1777 'SYMROOT': '<(DEPTH)/xcodebuild', 1773 'SYMROOT': '<(DEPTH)/xcodebuild',
1778 }, 1774 },
1779 } 1775 }
1780 1776
1781 # Local Variables: 1777 # Local Variables:
1782 # tab-width:2 1778 # tab-width:2
1783 # indent-tabs-mode:nil 1779 # indent-tabs-mode:nil
1784 # End: 1780 # End:
1785 # vim: set expandtab tabstop=2 shiftwidth=2: 1781 # 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