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

Side by Side Diff: chrome/test/gpu/test_support_gpu.gypi

Issue 10638010: Undo the startup_helper_win.h change in r143501 because that breaks the sandbox in component builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | « chrome/chrome_tests.gypi ('k') | content/content_shell.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) 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 # This file is meant to be included into targets which run gpu tests. 5 # This file is meant to be included into targets which run gpu tests.
6 { 6 {
7 'variables': { 7 'variables': {
8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu', 8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu',
9 'src_dir': '../../..', 9 'src_dir': '../../..',
10 }, 10 },
(...skipping 16 matching lines...) Expand all
27 'defines': [ 27 'defines': [
28 'HAS_OUT_OF_PROC_TEST_RUNNER', 28 'HAS_OUT_OF_PROC_TEST_RUNNER',
29 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"' , 29 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"' ,
30 ], 30 ],
31 'include_dirs': [ 31 'include_dirs': [
32 '<(src_dir)', 32 '<(src_dir)',
33 '<(test_list_out_dir)', 33 '<(test_list_out_dir)',
34 ], 34 ],
35 'sources': [ 35 'sources': [
36 '<(src_dir)/chrome/test/base/chrome_test_launcher.cc', 36 '<(src_dir)/chrome/test/base/chrome_test_launcher.cc',
37 '<(src_dir)/content/app/startup_helper_win.cc',
37 '<(src_dir)/content/test/gpu/test_switches.cc', 38 '<(src_dir)/content/test/gpu/test_switches.cc',
38 '<(src_dir)/content/test/gpu/test_switches.h', 39 '<(src_dir)/content/test/gpu/test_switches.h',
39 ], 40 ],
40 # hard_dependency is necessary for this target because it has actions 41 # hard_dependency is necessary for this target because it has actions
41 # that generate a header file included by dependent targets. The header 42 # that generate a header file included by dependent targets. The header
42 # file must be generated before the dependents are compiled. The usual 43 # file must be generated before the dependents are compiled. The usual
43 # semantics are to allow the two targets to build concurrently. 44 # semantics are to allow the two targets to build concurrently.
44 'hard_dependency': 1, 45 'hard_dependency': 1,
45 'conditions': [ 46 'conditions': [
46 ['OS=="win"', { 47 ['OS=="win"', {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 '<(src_dir)/build/linux/system.gyp:ssl', 101 '<(src_dir)/build/linux/system.gyp:ssl',
101 ], 102 ],
102 }], 103 }],
103 ['toolkit_views==1', { 104 ['toolkit_views==1', {
104 'dependencies': [ 105 'dependencies': [
105 '<(src_dir)/ui/views/views.gyp:views', 106 '<(src_dir)/ui/views/views.gyp:views',
106 ], 107 ],
107 }], 108 }],
108 ], 109 ],
109 } 110 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698