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

Side by Side Diff: chrome/chrome_exe.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 | « build/common.gypi ('k') | 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) 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 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_exe_target': 0, 8 'chrome_exe_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 }, 140 },
141 'targets': [ 141 'targets': [
142 { 142 {
143 'target_name': 'chrome', 143 'target_name': 'chrome',
144 'type': 'executable', 144 'type': 'executable',
145 'mac_bundle': 1, 145 'mac_bundle': 1,
146 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC', 146 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
147 'variables': { 147 'variables': {
148 'chrome_exe_target': 1, 148 'chrome_exe_target': 1,
149 'use_system_xdg_utils%': 0, 149 'use_system_xdg_utils%': 0,
150 'disable_pie%': 0,
150 }, 151 },
151 'conditions': [ 152 'conditions': [
152 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 153 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
153 'actions': [ 154 'actions': [
154 { 155 {
155 'action_name': 'manpage', 156 'action_name': 'manpage',
156 'conditions': [ 157 'conditions': [
157 [ 'branding == "Chrome"', { 158 [ 'branding == "Chrome"', {
158 'variables': { 159 'variables': {
159 'name': 'Google Chrome', 160 'name': 'Google Chrome',
(...skipping 20 matching lines...) Expand all
180 'app/resources/manpage.1.in', 181 'app/resources/manpage.1.in',
181 '<@(_outputs)', 182 '<@(_outputs)',
182 '-e', 's/@@NAME@@/<(name)/', 183 '-e', 's/@@NAME@@/<(name)/',
183 '-e', 's/@@FILENAME@@/<(filename)/', 184 '-e', 's/@@FILENAME@@/<(filename)/',
184 '-e', 's/@@CONFDIR@@/<(confdir)/', 185 '-e', 's/@@CONFDIR@@/<(confdir)/',
185 ], 186 ],
186 'message': 'Generating manpage' 187 'message': 'Generating manpage'
187 }, 188 },
188 ], 189 ],
189 'conditions': [ 190 'conditions': [
190 [ 'linux_use_tcmalloc==1', { 191 ['linux_use_tcmalloc==1', {
191 'dependencies': [ 192 'dependencies': [
192 '<(allocator_target)', 193 '<(allocator_target)',
193 ], 194 ],
194 }, 195 },
195 ], 196 ],
196 # TODO(rkc): Remove this once we have a fix for remote gdb 197 # TODO(rkc): Remove this once we have a fix for remote gdb
197 # and are able to correctly get section header offsets for 198 # and are able to correctly get section header offsets for
198 # pie executables. Currently -pie breaks remote debugging. 199 # pie executables. Currently -pie breaks remote debugging.
199 [ '(disable_pie==1 and chromeos==1)', { 200 ['disable_pie==1', {
200 'ldflags' : ['-nopie'], 201 'ldflags' : ['-nopie'],
201 } 202 }],
202 ],
203 ['use_system_xdg_utils==0', { 203 ['use_system_xdg_utils==0', {
204 'copies': [ 204 'copies': [
205 { 205 {
206 'destination': '<(PRODUCT_DIR)', 206 'destination': '<(PRODUCT_DIR)',
207 'files': ['tools/build/linux/chrome-wrapper', 207 'files': ['tools/build/linux/chrome-wrapper',
208 '../third_party/xdg-utils/scripts/xdg-mime', 208 '../third_party/xdg-utils/scripts/xdg-mime',
209 '../third_party/xdg-utils/scripts/xdg-settings', 209 '../third_party/xdg-utils/scripts/xdg-settings',
210 ], 210 ],
211 # The wrapper script above may need to generate a .desktop 211 # The wrapper script above may need to generate a .desktop
212 # file, which requires an icon. So, copy one next to the 212 # file, which requires an icon. So, copy one next to the
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 'configurations': { 528 'configurations': {
529 'Common_Base': { 529 'Common_Base': {
530 'msvs_target_platform': 'x64', 530 'msvs_target_platform': 'x64',
531 }, 531 },
532 }, 532 },
533 }, 533 },
534 ], 534 ],
535 }], 535 }],
536 ], 536 ],
537 } 537 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698