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

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

Issue 12328007: Revert 183414 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1418/src/
Patch Set: Created 7 years, 10 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 | webkit/tools/test_shell/webwidget_host_win.cc » ('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 { 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 '-lcomctl32.lib', 163 '-lcomctl32.lib',
164 ], 164 ],
165 }, 165 },
166 'include_dirs': [ 166 'include_dirs': [
167 '<(DEPTH)/third_party/wtl/include', 167 '<(DEPTH)/third_party/wtl/include',
168 '.', 168 '.',
169 ], 169 ],
170 'dependencies': [ 170 'dependencies': [
171 '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler', 171 '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
172 ], 172 ],
173 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
174 'msvs_disabled_warnings': [ 4267, ],
175 }, { # else: OS!=win 173 }, { # else: OS!=win
176 'sources/': [ 174 'sources/': [
177 ['exclude', '_webtheme(control|engine)\.(cc|h)$'], 175 ['exclude', '_webtheme(control|engine)\.(cc|h)$'],
178 ], 176 ],
179 'sources!': [ 177 'sources!': [
180 'drop_delegate.cc', 178 'drop_delegate.cc',
181 ], 179 ],
182 }], 180 }],
183 ], 181 ],
184 }, 182 },
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 '../webcore_unit_tests/BMPImageDecoder_unittest.cpp', 445 '../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
448 '../webcore_unit_tests/ICOImageDecoder_unittest.cpp', 446 '../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
449 '../webcore_unit_tests/XBMImageDecoder_unittest.cpp', 447 '../webcore_unit_tests/XBMImageDecoder_unittest.cpp',
450 'image_decoder_unittest.cc', 448 'image_decoder_unittest.cc',
451 'image_decoder_unittest.h', 449 'image_decoder_unittest.h',
452 ], 450 ],
453 'sources': [ 451 'sources': [
454 ], 452 ],
455 }], 453 }],
456 ['OS=="win"', { 454 ['OS=="win"', {
457 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 455 'msvs_disabled_warnings': [ 4800 ],
458 'msvs_disabled_warnings': [ 4800, 4267 ],
459 }], 456 }],
460 ['os_posix == 1 and OS != "mac"', { 457 ['os_posix == 1 and OS != "mac"', {
461 'conditions': [ 458 'conditions': [
462 ['linux_use_tcmalloc==1', { 459 ['linux_use_tcmalloc==1', {
463 'dependencies': [ 460 'dependencies': [
464 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 461 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
465 ], 462 ],
466 }], 463 }],
467 ], 464 ],
468 }], 465 }],
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 'action_name': 'test_shell_resources', 635 'action_name': 'test_shell_resources',
639 'includes': [ '../../../build/grit_action.gypi' ], 636 'includes': [ '../../../build/grit_action.gypi' ],
640 }, 637 },
641 ], 638 ],
642 'includes': [ '../../../build/grit_target.gypi' ], 639 'includes': [ '../../../build/grit_target.gypi' ],
643 }, 640 },
644 ], 641 ],
645 }], 642 }],
646 ], 643 ],
647 } 644 }
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/test_shell/webwidget_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698