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

Side by Side Diff: webkit/tools/test_shell/test_shell.gyp

Issue 335030: Fix test_shell_tests.exe runtime dependency.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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 | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'test_shell_windows_resource_files': [ 8 'test_shell_windows_resource_files': [
9 'resources/test_shell.rc', 9 'resources/test_shell.rc',
10 'resources/pan_east.cur', 10 'resources/pan_east.cur',
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 '../../../net/net.gyp:net', 116 '../../../net/net.gyp:net',
117 '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', 117 '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
118 '../../webkit.gyp:glue', 118 '../../webkit.gyp:glue',
119 '../../webkit.gyp:webkit', 119 '../../webkit.gyp:webkit',
120 ], 120 ],
121 'conditions': [ 121 'conditions': [
122 # http://code.google.com/p/chromium/issues/detail?id=18337 122 # http://code.google.com/p/chromium/issues/detail?id=18337
123 ['target_arch!="x64"', { 123 ['target_arch!="x64"', {
124 'dependencies': [ 124 'dependencies': [
125 'npapi_layout_test_plugin', 125 'npapi_layout_test_plugin',
126 ],
127 }],
128 ['OS!="win" and target_arch!="x64"', {
129 'dependencies': [
130 'npapi_test_plugin', 126 'npapi_test_plugin',
131 ], 127 ],
132 }], 128 }],
133 ['OS=="linux"', { 129 ['OS=="linux"', {
134 'dependencies': [ 130 'dependencies': [
135 'test_shell_resources', 131 'test_shell_resources',
136 '../../../build/linux/system.gyp:gtk', 132 '../../../build/linux/system.gyp:gtk',
137 '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 133 '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
138 ], 134 ],
139 # for: test_shell_gtk.cc 135 # for: test_shell_gtk.cc
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 ], 688 ],
693 }], 689 }],
694 ], 690 ],
695 } 691 }
696 692
697 # Local Variables: 693 # Local Variables:
698 # tab-width:2 694 # tab-width:2
699 # indent-tabs-mode:nil 695 # indent-tabs-mode:nil
700 # End: 696 # End:
701 # vim: set expandtab tabstop=2 shiftwidth=2: 697 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698