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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 9705052: Revert 126777 - Broke 'win' trybot (shared + all = fails linking pyautolib due to over swigging) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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/test/functional/https.py » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
11 'common/pref_names.h', 11 'common/pref_names.h',
12 'test/automation/browser_proxy.cc', 12 'test/automation/browser_proxy.cc',
13 'test/automation/browser_proxy.h', 13 'test/automation/browser_proxy.h',
14 'test/automation/tab_proxy.cc', 14 'test/automation/tab_proxy.cc',
15 'test/automation/tab_proxy.h', 15 'test/automation/tab_proxy.h',
16 '../content/public/common/page_type.h',
17 '../content/public/common/security_style.h',
18 # Must come before cert_status_flags.h
19 '../net/base/net_export.h',
20 '../net/base/cert_status_flags.h',
21 ], 16 ],
22 'pyautolib_libraries': [ 17 'pyautolib_libraries': [
23 ], 18 ],
24 'conditions': [ 19 'conditions': [
25 ['asan==1', { 20 ['asan==1', {
26 'pyautolib_libraries': [ 21 'pyautolib_libraries': [
27 # Link in the libasan32.a because this binary will be loaded by 22 # Link in the libasan32.a because this binary will be loaded by
28 # Python that does not have libasan in. 23 # Python that does not have libasan in.
29 '-lasan32', 24 '-lasan32',
30 ] 25 ]
(...skipping 4731 matching lines...) Expand 10 before | Expand all | Expand 10 after
4762 # Use outputs of this action as inputs for the main target build. 4757 # Use outputs of this action as inputs for the main target build.
4763 # Seems as a misnomer but makes this happy on Linux (scons). 4758 # Seems as a misnomer but makes this happy on Linux (scons).
4764 'process_outputs_as_sources': 1, 4759 'process_outputs_as_sources': 1,
4765 }, 4760 },
4766 ], # 'actions' 4761 ], # 'actions'
4767 }, 4762 },
4768 ] 4763 ]
4769 }], # 'coverage!=0' 4764 }], # 'coverage!=0'
4770 ], # 'conditions' 4765 ], # 'conditions'
4771 } 4766 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/functional/https.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698