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

Side by Side Diff: chrome/test/interactive_ui/interactive_ui_tests.gypi

Issue 602006: Remove webkit.gyp:pull_in_test_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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 | « chrome/chrome_tests.gypi ('k') | third_party/ffmpeg/ffmpeg.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'target_name': 'interactive_ui_tests', 2 'target_name': 'interactive_ui_tests',
3 'type': 'executable', 3 'type': 'executable',
4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', 4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
5 'dependencies': [ 5 'dependencies': [
6 '<(DEPTH)/chrome/chrome.gyp:chrome', 6 '<(DEPTH)/chrome/chrome.gyp:chrome',
7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources', 7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources',
8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings', 8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings',
9 '<(DEPTH)/chrome/chrome.gyp:debugger', 9 '<(DEPTH)/chrome/chrome.gyp:debugger',
10 '<(DEPTH)/chrome/chrome.gyp:test_support_common', 10 '<(DEPTH)/chrome/chrome.gyp:test_support_common',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', 58 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
59 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', 59 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
60 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', 60 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
61 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', 61 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
62 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', 62 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
63 ], 63 ],
64 }], # OS=="linux" 64 }], # OS=="linux"
65 ['target_arch!="x64" and target_arch!="arm"', { 65 ['target_arch!="x64" and target_arch!="arm"', {
66 'dependencies': [ 66 'dependencies': [
67 # run time dependency 67 # run time dependency
68 '<(DEPTH)/webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', 68 '<(DEPTH)/webkit/webkit.gyp:npapi_test_plugin',
69 ], 69 ],
70 }], # target_arch 70 }], # target_arch
71 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { 71 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
72 'dependencies': [ 72 'dependencies': [
73 '<(DEPTH)/views/views.gyp:views', 73 '<(DEPTH)/views/views.gyp:views',
74 ], 74 ],
75 }], 75 }],
76 ['OS=="mac"', { 76 ['OS=="mac"', {
77 'sources!': [ 77 'sources!': [
78 # TODO(port) 78 # TODO(port)
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 'msvs_settings': { 137 'msvs_settings': {
138 'VCLinkerTool': { 138 'VCLinkerTool': {
139 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 139 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
140 }, 140 },
141 }, 141 },
142 }, 142 },
143 }, # configurations 143 }, # configurations
144 }], # OS=="win" 144 }], # OS=="win"
145 ], # conditions 145 ], # conditions
146 } 146 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | third_party/ffmpeg/ffmpeg.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698