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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 3135001: Enable -fPIC by default on x64 (Closed)
Patch Set: . Created 10 years, 3 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
« no previous file with comments | « build/common.gypi ('k') | gpu/demos/demos.gyp » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'variables' : { 6 'variables' : {
7 'pyautolib_sources': [ 7 'pyautolib_sources': [
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/pref_names.cc', 9 'common/pref_names.cc',
10 'common/pref_names.h', 10 'common/pref_names.h',
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 },], 589 },],
590 ['OS=="win"', { 590 ['OS=="win"', {
591 'sources': [ 591 'sources': [
592 '../sandbox/tests/validation_tests/commands.cc', 592 '../sandbox/tests/validation_tests/commands.cc',
593 '../sandbox/tests/validation_tests/commands.h', 593 '../sandbox/tests/validation_tests/commands.h',
594 '../sandbox/tests/common/controller.h', 594 '../sandbox/tests/common/controller.h',
595 'test/nacl_security_tests/nacl_security_tests_win.h', 595 'test/nacl_security_tests/nacl_security_tests_win.h',
596 'test/nacl_security_tests/nacl_security_tests_win.cc', 596 'test/nacl_security_tests/nacl_security_tests_win.cc',
597 ], 597 ],
598 },], 598 },],
599 # set fPIC for linux in case it isn't set.
600 ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_f pic!=1', {
601 'cflags': ['-fPIC'],
602 },],
603 ], 599 ],
604 }, 600 },
605 { 601 {
606 'target_name': 'nacl_sandbox_tests', 602 'target_name': 'nacl_sandbox_tests',
607 'type': 'executable', 603 'type': 'executable',
608 'msvs_guid': '3087FC25-2C24-44B2-8253-44065EB47ACD', 604 'msvs_guid': '3087FC25-2C24-44B2-8253-44065EB47ACD',
609 'dependencies': [ 605 'dependencies': [
610 'chrome', 606 'chrome',
611 'browser', 607 'browser',
612 'debugger', 608 'debugger',
(...skipping 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after
2621 ], 2617 ],
2622 }, 2618 },
2623 'sources': [ 2619 'sources': [
2624 'test/chrome_plugin/test_chrome_plugin.cc', 2620 'test/chrome_plugin/test_chrome_plugin.cc',
2625 'test/chrome_plugin/test_chrome_plugin.def', 2621 'test/chrome_plugin/test_chrome_plugin.def',
2626 'test/chrome_plugin/test_chrome_plugin.h', 2622 'test/chrome_plugin/test_chrome_plugin.h',
2627 ], 2623 ],
2628 }, 2624 },
2629 ]}, # 'targets' 2625 ]}, # 'targets'
2630 ], # OS=="win" 2626 ], # OS=="win"
2631 # Build on linux x86_64 only if linux_fpic==1
2632 ['OS=="mac" or (OS=="win" and component=="static_library") ' 2627 ['OS=="mac" or (OS=="win" and component=="static_library") '
2633 'or (OS=="linux" and target_arch==python_arch ' 2628 'or (OS=="linux" and target_arch==python_arch)', {
2634 'and (target_arch!="x64" or linux_fpic==1))', {
2635 'targets': [ 2629 'targets': [
2636 { 2630 {
2637 # Documentation: http://dev.chromium.org/developers/testing/pyauto 2631 # Documentation: http://dev.chromium.org/developers/testing/pyauto
2638 'target_name': 'pyautolib', 2632 'target_name': 'pyautolib',
2639 'type': 'shared_library', 2633 'type': 'shared_library',
2640 'product_prefix': '_', 2634 'product_prefix': '_',
2641 'dependencies': [ 2635 'dependencies': [
2642 'chrome', 2636 'chrome',
2643 'debugger', 2637 'debugger',
2644 'syncapi', 2638 'syncapi',
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
2929 ] 2923 ]
2930 }], # 'coverage!=0' 2924 }], # 'coverage!=0'
2931 ], # 'conditions' 2925 ], # 'conditions'
2932 } 2926 }
2933 2927
2934 # Local Variables: 2928 # Local Variables:
2935 # tab-width:2 2929 # tab-width:2
2936 # indent-tabs-mode:nil 2930 # indent-tabs-mode:nil
2937 # End: 2931 # End:
2938 # vim: set expandtab tabstop=2 shiftwidth=2: 2932 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | gpu/demos/demos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698