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

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

Issue 2813047: Move default_plugin from webkit/ to chrome/ (Closed)
Patch Set: fix windows? 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/glue/webkit_glue.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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'libraries': [ 152 'libraries': [
153 '-lcomctl32.lib', 153 '-lcomctl32.lib',
154 ], 154 ],
155 }, 155 },
156 'include_dirs': [ 156 'include_dirs': [
157 '<(DEPTH)/third_party/wtl/include', 157 '<(DEPTH)/third_party/wtl/include',
158 '.', 158 '.',
159 ], 159 ],
160 'dependencies': [ 160 'dependencies': [
161 '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler', 161 '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
162 '<(DEPTH)/webkit/default_plugin/default_plugin.gyp:default_plugin',
163 ], 162 ],
164 # TODO(bradnelson): 163 # TODO(bradnelson):
165 # This should really be done in the 'npapi_layout_test_plugin' 164 # This should really be done in the 'npapi_layout_test_plugin'
166 # target, but the current VS generator handles 'copies' 165 # target, but the current VS generator handles 'copies'
167 # settings as AdditionalDependencies, which means that 166 # settings as AdditionalDependencies, which means that
168 # when it's over there, it tries to do the copy *before* 167 # when it's over there, it tries to do the copy *before*
169 # the file is built, instead of after. We work around this 168 # the file is built, instead of after. We work around this
170 # by attaching the copy here, since it depends on that 169 # by attaching the copy here, since it depends on that
171 # target. 170 # target.
172 'copies': [ 171 'copies': [
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 ], 709 ],
711 }], 710 }],
712 ], 711 ],
713 } 712 }
714 713
715 # Local Variables: 714 # Local Variables:
716 # tab-width:2 715 # tab-width:2
717 # indent-tabs-mode:nil 716 # indent-tabs-mode:nil
718 # End: 717 # End:
719 # vim: set expandtab tabstop=2 shiftwidth=2: 718 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698