OLD | NEW |
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 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'test_shell_windows_resource_files': [ | 7 'test_shell_windows_resource_files': [ |
8 'resources/test_shell.rc', | 8 'resources/test_shell.rc', |
9 '../../glue/resources/pan_east.cur', | 9 '../../glue/resources/pan_east.cur', |
10 '../../glue/resources/pan_middle.cur', | 10 '../../glue/resources/pan_middle.cur', |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', | 136 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', |
137 '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent', | 137 '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent', |
138 ], | 138 ], |
139 'conditions': [ | 139 'conditions': [ |
140 ['OS!="android" and OS!="ios"', { | 140 ['OS!="android" and OS!="ios"', { |
141 # npapi test plugin doesn't build on android or ios | 141 # npapi test plugin doesn't build on android or ios |
142 'dependencies': [ | 142 'dependencies': [ |
143 'copy_npapi_test_plugin', | 143 'copy_npapi_test_plugin', |
144 ], | 144 ], |
145 }], | 145 }], |
| 146 ['use_x11==1', { |
| 147 'dependencies': [ |
| 148 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 149 ], |
| 150 }], |
146 ['toolkit_uses_gtk == 1', { | 151 ['toolkit_uses_gtk == 1', { |
147 'dependencies': [ | 152 'dependencies': [ |
148 'test_shell_resources', | 153 'test_shell_resources', |
149 '<(DEPTH)/build/linux/system.gyp:gtk', | 154 '<(DEPTH)/build/linux/system.gyp:gtk', |
150 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | |
151 ], | 155 ], |
152 # for: test_shell_gtk.cc | 156 # for: test_shell_gtk.cc |
153 'cflags': ['-Wno-multichar'], | 157 'cflags': ['-Wno-multichar'], |
154 }], | 158 }], |
155 ['OS=="win"', { | 159 ['OS=="win"', { |
156 'msvs_disabled_warnings': [ 4800 ], | 160 'msvs_disabled_warnings': [ 4800 ], |
157 'link_settings': { | 161 'link_settings': { |
158 'libraries': [ | 162 'libraries': [ |
159 '-lcomctl32.lib', | 163 '-lcomctl32.lib', |
160 ], | 164 ], |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 'action_name': 'test_shell_resources', | 635 'action_name': 'test_shell_resources', |
632 'includes': [ '../../../build/grit_action.gypi' ], | 636 'includes': [ '../../../build/grit_action.gypi' ], |
633 }, | 637 }, |
634 ], | 638 ], |
635 'includes': [ '../../../build/grit_target.gypi' ], | 639 'includes': [ '../../../build/grit_target.gypi' ], |
636 }, | 640 }, |
637 ], | 641 ], |
638 }], | 642 }], |
639 ], | 643 ], |
640 } | 644 } |
OLD | NEW |