| OLD | NEW |
| 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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 ], | 194 ], |
| 195 }, | 195 }, |
| 196 ], | 196 ], |
| 197 # TODO(rkc): Remove disable_pie (and instead always use | 197 # TODO(rkc): Remove disable_pie (and instead always use |
| 198 # -pie) once we have a fix for remote gdb and are able to | 198 # -pie) once we have a fix for remote gdb and are able to |
| 199 # correctly get section header offsets for pie | 199 # correctly get section header offsets for pie |
| 200 # executables. Currently -pie breaks remote debugging. | 200 # executables. Currently -pie breaks remote debugging. |
| 201 ['disable_pie==1', { | 201 ['disable_pie==1', { |
| 202 'ldflags': ['-nopie'], | 202 'ldflags': ['-nopie'], |
| 203 }, { | 203 }, { |
| 204 # Building with -fPIE fails on ARM and ia32 bots. | 204 # Building with -pie needs investigating on ARM. |
| 205 # http://code.google.com/p/chromium/issues/detail?id=57908 | 205 # For now, at least use it on Linux Intel. |
| 206 # Until that is fixed, at least use it on Linux 64-bit. | |
| 207 'conditions': [ | 206 'conditions': [ |
| 208 ['target_arch=="x64"', { | 207 ['target_arch=="x64" or target_arch=="ia32"', { |
| 209 'ldflags': ['-pie'], | 208 'ldflags': ['-pie'], |
| 210 }], | 209 }], |
| 211 ], | 210 ], |
| 212 }], | 211 }], |
| 213 ['use_system_xdg_utils==0', { | 212 ['use_system_xdg_utils==0', { |
| 214 'copies': [ | 213 'copies': [ |
| 215 { | 214 { |
| 216 'destination': '<(PRODUCT_DIR)', | 215 'destination': '<(PRODUCT_DIR)', |
| 217 'files': ['tools/build/linux/chrome-wrapper', | 216 'files': ['tools/build/linux/chrome-wrapper', |
| 218 '../third_party/xdg-utils/scripts/xdg-mime', | 217 '../third_party/xdg-utils/scripts/xdg-mime', |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 'configurations': { | 519 'configurations': { |
| 521 'Common_Base': { | 520 'Common_Base': { |
| 522 'msvs_target_platform': 'x64', | 521 'msvs_target_platform': 'x64', |
| 523 }, | 522 }, |
| 524 }, | 523 }, |
| 525 }, | 524 }, |
| 526 ], | 525 ], |
| 527 }], | 526 }], |
| 528 ], | 527 ], |
| 529 } | 528 } |
| OLD | NEW |