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

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

Issue 2825055: Step 1 in getting rid of duplicate warning in make build. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: fix win Created 10 years, 5 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 | « webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi ('k') | 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) 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 'test_shell_windows_resource_files': [ 7 'test_shell_windows_resource_files': [
8 'resources/test_shell.rc', 8 'resources/test_shell.rc',
9 'resources/pan_east.cur', 9 'resources/pan_east.cur',
10 'resources/pan_middle.cur', 10 'resources/pan_middle.cur',
(...skipping 24 matching lines...) Expand all
35 '<(DEPTH)/media/media.gyp:media', 35 '<(DEPTH)/media/media.gyp:media',
36 '<(DEPTH)/net/net.gyp:net', 36 '<(DEPTH)/net/net.gyp:net',
37 '<(DEPTH)/skia/skia.gyp:skia', 37 '<(DEPTH)/skia/skia.gyp:skia',
38 '<(DEPTH)/testing/gmock.gyp:gmock', 38 '<(DEPTH)/testing/gmock.gyp:gmock',
39 '<(DEPTH)/testing/gtest.gyp:gtest', 39 '<(DEPTH)/testing/gtest.gyp:gtest',
40 '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:inspector_resour ces', 40 '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:inspector_resour ces',
41 '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', 41 '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
42 '<(DEPTH)/webkit/support/webkit_support.gyp:appcache', 42 '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
43 '<(DEPTH)/webkit/support/webkit_support.gyp:database', 43 '<(DEPTH)/webkit/support/webkit_support.gyp:database',
44 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', 44 '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
45 '<(DEPTH)/webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
46 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 45 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
47 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', 46 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
48 ], 47 ],
49 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC', 48 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
50 'sources': [ 49 'sources': [
51 'mac/test_shell_webview.h', 50 'mac/test_shell_webview.h',
52 'mac/test_shell_webview.mm', 51 'mac/test_shell_webview.mm',
53 'mac/test_webview_delegate.mm', 52 'mac/test_webview_delegate.mm',
54 'mac/webview_host.mm', 53 'mac/webview_host.mm',
55 'mac/webwidget_host.mm', 54 'mac/webwidget_host.mm',
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 }], 129 }],
131 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 130 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
132 'dependencies': [ 131 'dependencies': [
133 'test_shell_resources', 132 'test_shell_resources',
134 '<(DEPTH)/build/linux/system.gyp:gtk', 133 '<(DEPTH)/build/linux/system.gyp:gtk',
135 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 134 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
136 ], 135 ],
137 # for: test_shell_gtk.cc 136 # for: test_shell_gtk.cc
138 'cflags': ['-Wno-multichar'], 137 'cflags': ['-Wno-multichar'],
139 }], 138 }],
140 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
141 # See below TODO in the Windows branch.
142 'copies': [
143 {
144 'destination': '<(PRODUCT_DIR)/plugins',
145 'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
146 },
147 ],
148 }],
149 ['OS=="win"', { 139 ['OS=="win"', {
150 'msvs_disabled_warnings': [ 4800 ], 140 'msvs_disabled_warnings': [ 4800 ],
151 'link_settings': { 141 'link_settings': {
152 'libraries': [ 142 'libraries': [
153 '-lcomctl32.lib', 143 '-lcomctl32.lib',
154 ], 144 ],
155 }, 145 },
156 'include_dirs': [ 146 'include_dirs': [
157 '<(DEPTH)/third_party/wtl/include', 147 '<(DEPTH)/third_party/wtl/include',
158 '.', 148 '.',
159 ], 149 ],
160 'dependencies': [ 150 'dependencies': [
161 '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler', 151 '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
162 ], 152 ],
163 # TODO(bradnelson):
164 # This should really be done in the 'npapi_layout_test_plugin'
165 # target, but the current VS generator handles 'copies'
166 # settings as AdditionalDependencies, which means that
167 # when it's over there, it tries to do the copy *before*
168 # the file is built, instead of after. We work around this
169 # by attaching the copy here, since it depends on that
170 # target.
171 'copies': [
172 {
173 'destination': '<(PRODUCT_DIR)/plugins',
174 'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
175 },
176 ],
177 }, { # else: OS!=win 153 }, { # else: OS!=win
178 'sources/': [ 154 'sources/': [
179 ['exclude', '_webtheme(control|engine)\.(cc|h)$'], 155 ['exclude', '_webtheme(control|engine)\.(cc|h)$'],
180 ], 156 ],
181 'sources!': [ 157 'sources!': [
182 'drag_delegate.cc', 158 'drag_delegate.cc',
183 'drop_delegate.cc', 159 'drop_delegate.cc',
184 ], 160 ],
185 }], 161 }],
186 ], 162 ],
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 'variables': { 207 'variables': {
232 'chromium_code': 1, 208 'chromium_code': 1,
233 }, 209 },
234 'mac_bundle': 1, 210 'mac_bundle': 1,
235 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9', 211 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
236 'dependencies': [ 212 'dependencies': [
237 'test_shell_common', 213 'test_shell_common',
238 '<(DEPTH)/net/net.gyp:net_test_support', 214 '<(DEPTH)/net/net.gyp:net_test_support',
239 '<(DEPTH)/skia/skia.gyp:skia', 215 '<(DEPTH)/skia/skia.gyp:skia',
240 '<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff', 216 '<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff',
217 '<(DEPTH)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugi n',
241 ], 218 ],
242 'defines': [ 219 'defines': [
243 # Technically not a unit test but require functions available only to 220 # Technically not a unit test but require functions available only to
244 # unit tests. 221 # unit tests.
245 'UNIT_TEST' 222 'UNIT_TEST'
246 ], 223 ],
247 'sources': [ 224 'sources': [
248 'test_shell_main.cc', 225 'test_shell_main.cc',
249 ], 226 ],
250 'mac_bundle_resources': [ 227 'mac_bundle_resources': [
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 '<@(pak_inputs)', 301 '<@(pak_inputs)',
325 ], 302 ],
326 'outputs': [ 303 'outputs': [
327 '<(INTERMEDIATE_DIR)/repack/test_shell.pak', 304 '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
328 ], 305 ],
329 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp uts)'], 306 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp uts)'],
330 'process_outputs_as_mac_bundle_resources': 1, 307 'process_outputs_as_mac_bundle_resources': 1,
331 }, 308 },
332 ], 309 ],
333 'copies': [ 310 'copies': [
334 {
335 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/PlugIns/',
336 'files': [
337 '<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/',
338 ],
339 },
340 # TODO(ajwong): This, and the parallel chromium stanza below 311 # TODO(ajwong): This, and the parallel chromium stanza below
341 # really should find a way to share file paths with 312 # really should find a way to share file paths with
342 # ffmpeg.gyp so they don't diverge. (BUG=23602) 313 # ffmpeg.gyp so they don't diverge. (BUG=23602)
343 { 314 {
344 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', 315 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
345 'files': [ 316 'files': [
346 '<(PRODUCT_DIR)/libffmpegsumo.dylib', 317 '<(PRODUCT_DIR)/libffmpegsumo.dylib',
347 ], 318 ],
348 }, 319 },
349 ], 320 ],
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 ], 680 ],
710 }], 681 }],
711 ], 682 ],
712 } 683 }
713 684
714 # Local Variables: 685 # Local Variables:
715 # tab-width:2 686 # tab-width:2
716 # indent-tabs-mode:nil 687 # indent-tabs-mode:nil
717 # End: 688 # End:
718 # vim: set expandtab tabstop=2 shiftwidth=2: 689 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698