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

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

Issue 487003: remove chromeos dependency from linux_view (Closed)
Patch Set: " Created 11 years 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 | « chrome/chrome_tests.gypi ('k') | views/widget/widget_gtk.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 { 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', 62 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
63 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', 63 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
64 ], 64 ],
65 }], # OS=="linux" 65 }], # OS=="linux"
66 ['target_arch!="x64" and target_arch!="arm"', { 66 ['target_arch!="x64" and target_arch!="arm"', {
67 'dependencies': [ 67 'dependencies': [
68 # run time dependency 68 # run time dependency
69 '<(DEPTH)/webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', 69 '<(DEPTH)/webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
70 ], 70 ],
71 }], # target_arch 71 }], # target_arch
72 ['OS=="linux" and toolkit_views==1', { 72 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
73 'dependencies': [ 73 'dependencies': [
74 '<(DEPTH)/views/views.gyp:views', 74 '<(DEPTH)/views/views.gyp:views',
75 ], 75 ],
76 }], 76 }],
77 ['OS=="mac"', { 77 ['OS=="mac"', {
78 'sources!': [ 78 'sources!': [
79 # TODO(port) 79 # TODO(port)
80 '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest .cc', 80 '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest .cc',
81 '<(DEPTH)/chrome/browser/browser_focus_uitest.cc', 81 '<(DEPTH)/chrome/browser/browser_focus_uitest.cc',
82 '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc', 82 '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 'msvs_settings': { 139 'msvs_settings': {
140 'VCLinkerTool': { 140 'VCLinkerTool': {
141 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 141 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
142 }, 142 },
143 }, 143 },
144 }, 144 },
145 }, # configurations 145 }, # configurations
146 }], # OS=="win" 146 }], # OS=="win"
147 ], # conditions 147 ], # conditions
148 } 148 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698