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

Side by Side Diff: chrome/chrome_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_browser.gypi ('k') | chrome/test/interactive_ui/interactive_ui_tests.gypi » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'browser_tests_sources_views_specific': [ 7 'browser_tests_sources_views_specific': [
8 'browser/extensions/browser_action_test_util_views.cc', 8 'browser/extensions/browser_action_test_util_views.cc',
9 'browser/views/find_bar_host_browsertest.cc', 9 'browser/views/find_bar_host_browsertest.cc',
10 ], 10 ],
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 'sources!': [ 330 'sources!': [
331 # TODO(port) 331 # TODO(port)
332 'browser/login_prompt_uitest.cc', 332 'browser/login_prompt_uitest.cc',
333 'test/ui/layout_plugin_uitest.cc', 333 'test/ui/layout_plugin_uitest.cc',
334 ], 334 ],
335 }, { # else: OS != "linux" 335 }, { # else: OS != "linux"
336 'sources!': [ 336 'sources!': [
337 'browser/process_singleton_linux_uitest.cc', 337 'browser/process_singleton_linux_uitest.cc',
338 ], 338 ],
339 }], 339 }],
340 ['OS=="linux" and toolkit_views==1', { 340 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
341 'dependencies': [ 341 'dependencies': [
342 '../views/views.gyp:views', 342 '../views/views.gyp:views',
343 ], 343 ],
344 }], 344 }],
345 ['OS=="mac"', { 345 ['OS=="mac"', {
346 'sources!': [ 346 'sources!': [
347 # TODO(port) 347 # TODO(port)
348 'app/chrome_main_uitest.cc', 348 'app/chrome_main_uitest.cc',
349 'browser/login_prompt_uitest.cc', 349 'browser/login_prompt_uitest.cc',
350 'browser/metrics/metrics_service_uitest.cc', 350 'browser/metrics/metrics_service_uitest.cc',
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 'test/render_view_test.cc', 849 'test/render_view_test.cc',
850 'test/render_view_test.h', 850 'test/render_view_test.h',
851 'test/sync/test_http_bridge_factory.h', 851 'test/sync/test_http_bridge_factory.h',
852 'test/test_notification_tracker.cc', 852 'test/test_notification_tracker.cc',
853 'test/test_notification_tracker.h', 853 'test/test_notification_tracker.h',
854 'test/v8_unit_test.cc', 854 'test/v8_unit_test.cc',
855 'test/v8_unit_test.h', 855 'test/v8_unit_test.h',
856 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/comp act_lang_det_unittest_small.cc', 856 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/comp act_lang_det_unittest_small.cc',
857 ], 857 ],
858 'conditions': [ 858 'conditions': [
859 ['chromeos==0 and toolkit_views==0', { 859 ['chromeos==0', {
860 'sources/': [ 860 'sources/': [
861 ['exclude', '^browser/chromeos'], 861 ['exclude', '^browser/chromeos'],
862 ], 862 ],
863 }], 863 }],
864 ['OS=="linux" and selinux==0', { 864 ['OS=="linux" and selinux==0', {
865 'dependencies': [ 865 'dependencies': [
866 '../sandbox/sandbox.gyp:*', 866 '../sandbox/sandbox.gyp:*',
867 ], 867 ],
868 }], 868 }],
869 ['OS=="linux"', { 869 ['OS=="linux"', {
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 ['OS=="linux"', { 1147 ['OS=="linux"', {
1148 'dependencies': [ 1148 'dependencies': [
1149 '../build/linux/system.gyp:gtk', 1149 '../build/linux/system.gyp:gtk',
1150 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1150 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1151 ], 1151 ],
1152 }], 1152 }],
1153 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { 1153 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
1154 'dependencies': [ 1154 'dependencies': [
1155 '../views/views.gyp:views', 1155 '../views/views.gyp:views',
1156 ], 1156 ],
1157 }],
1158 ['OS=="linux" and toolkit_views==1', {
1159 'sources': [ 1157 'sources': [
1160 '<@(browser_tests_sources_views_specific)', 1158 '<@(browser_tests_sources_views_specific)',
1161 ], 1159 ],
1162 }], 1160 }],
1163 ['OS=="linux" and toolkit_views==0', { 1161 ['OS=="linux" and toolkit_views==0 and chromeos==0', {
1164 'sources': [ 1162 'sources': [
1165 'browser/extensions/browser_action_test_util_gtk.cc', 1163 'browser/extensions/browser_action_test_util_gtk.cc',
1166 'browser/gtk/view_id_util_browsertest.cc', 1164 'browser/gtk/view_id_util_browsertest.cc',
1167 ], 1165 ],
1168 }], 1166 }],
1169 ['OS=="mac"', { 1167 ['OS=="mac"', {
1170 'sources': [ 1168 'sources': [
1171 'browser/extensions/browser_action_test_util_mac.mm', 1169 'browser/extensions/browser_action_test_util_mac.mm',
1172 ], 1170 ],
1173 'include_dirs': [ 1171 'include_dirs': [
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1215 'test/startup/feature_startup_test.cc', 1213 'test/startup/feature_startup_test.cc',
1216 'test/startup/startup_test.cc', 1214 'test/startup/startup_test.cc',
1217 ], 1215 ],
1218 'conditions': [ 1216 'conditions': [
1219 ['OS=="linux"', { 1217 ['OS=="linux"', {
1220 'dependencies': [ 1218 'dependencies': [
1221 '../build/linux/system.gyp:gtk', 1219 '../build/linux/system.gyp:gtk',
1222 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1220 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1223 ], 1221 ],
1224 }], 1222 }],
1225 ['OS=="linux" and toolkit_views==1', { 1223 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
1226 'dependencies': [ 1224 'dependencies': [
1227 '../views/views.gyp:views', 1225 '../views/views.gyp:views',
1228 ], 1226 ],
1229 }], 1227 }],
1230 ['OS=="win"', { 1228 ['OS=="win"', {
1231 'dependencies': [ 1229 'dependencies': [
1232 '<(allocator_target)', 1230 '<(allocator_target)',
1233 ], 1231 ],
1234 },], 1232 },],
1235 ['OS=="linux" or OS=="freebsd"', { 1233 ['OS=="linux" or OS=="freebsd"', {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 'sources': [ 1299 'sources': [
1302 'test/page_cycler/page_cycler_test.cc', 1300 'test/page_cycler/page_cycler_test.cc',
1303 ], 1301 ],
1304 'conditions': [ 1302 'conditions': [
1305 ['OS=="linux"', { 1303 ['OS=="linux"', {
1306 'dependencies': [ 1304 'dependencies': [
1307 '../build/linux/system.gyp:gtk', 1305 '../build/linux/system.gyp:gtk',
1308 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1306 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1309 ], 1307 ],
1310 }], 1308 }],
1311 ['OS=="win" or (OS=="linux" and toolkit_views==1)', { 1309 ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', {
1312 'dependencies': [ 1310 'dependencies': [
1313 '../views/views.gyp:views', 1311 '../views/views.gyp:views',
1314 ], 1312 ],
1315 }], 1313 }],
1316 ], 1314 ],
1317 }, 1315 },
1318 { 1316 {
1319 'target_name': 'tab_switching_test', 1317 'target_name': 'tab_switching_test',
1320 'type': 'executable', 1318 'type': 'executable',
1321 'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98', 1319 'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98',
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 'dependencies': [ 1539 'dependencies': [
1542 '../build/linux/system.gyp:gtk', 1540 '../build/linux/system.gyp:gtk',
1543 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1541 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1544 ], 1542 ],
1545 'sources!': [ 1543 'sources!': [
1546 # TODO(port): 1544 # TODO(port):
1547 'browser/safe_browsing/filter_false_positive_perftest.cc', 1545 'browser/safe_browsing/filter_false_positive_perftest.cc',
1548 'browser/visitedlink_perftest.cc', 1546 'browser/visitedlink_perftest.cc',
1549 ], 1547 ],
1550 }], 1548 }],
1551 ['OS=="win" or (OS=="linux" and toolkit_views==1)', { 1549 ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', {
1552 'dependencies': [ 1550 'dependencies': [
1553 '../views/views.gyp:views', 1551 '../views/views.gyp:views',
1554 ], 1552 ],
1555 }], 1553 }],
1556 ['OS=="win"', { 1554 ['OS=="win"', {
1557 'configurations': { 1555 'configurations': {
1558 'Debug': { 1556 'Debug': {
1559 'msvs_settings': { 1557 'msvs_settings': {
1560 'VCLinkerTool': { 1558 'VCLinkerTool': {
1561 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1559 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1824 ] 1822 ]
1825 }], # 'coverage!=0' 1823 }], # 'coverage!=0'
1826 ], # 'conditions' 1824 ], # 'conditions'
1827 } 1825 }
1828 1826
1829 # Local Variables: 1827 # Local Variables:
1830 # tab-width:2 1828 # tab-width:2
1831 # indent-tabs-mode:nil 1829 # indent-tabs-mode:nil
1832 # End: 1830 # End:
1833 # vim: set expandtab tabstop=2 shiftwidth=2: 1831 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/test/interactive_ui/interactive_ui_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698