Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 8750f1ceca6f6334be2cabaf65a57b459d10e6f7..92111f644a4b036d99e04ab08e400b39e96562a6 100755 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -337,7 +337,7 @@ |
'browser/process_singleton_linux_uitest.cc', |
], |
}], |
- ['OS=="linux" and toolkit_views==1', { |
+ ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { |
'dependencies': [ |
'../views/views.gyp:views', |
], |
@@ -856,7 +856,7 @@ |
'../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', |
], |
'conditions': [ |
- ['chromeos==0 and toolkit_views==0', { |
+ ['chromeos==0', { |
'sources/': [ |
['exclude', '^browser/chromeos'], |
], |
@@ -1154,13 +1154,11 @@ |
'dependencies': [ |
'../views/views.gyp:views', |
], |
- }], |
- ['OS=="linux" and toolkit_views==1', { |
'sources': [ |
'<@(browser_tests_sources_views_specific)', |
], |
}], |
- ['OS=="linux" and toolkit_views==0', { |
+ ['OS=="linux" and toolkit_views==0 and chromeos==0', { |
'sources': [ |
'browser/extensions/browser_action_test_util_gtk.cc', |
'browser/gtk/view_id_util_browsertest.cc', |
@@ -1222,7 +1220,7 @@ |
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
], |
}], |
- ['OS=="linux" and toolkit_views==1', { |
+ ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { |
'dependencies': [ |
'../views/views.gyp:views', |
], |
@@ -1308,7 +1306,7 @@ |
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
], |
}], |
- ['OS=="win" or (OS=="linux" and toolkit_views==1)', { |
+ ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', { |
'dependencies': [ |
'../views/views.gyp:views', |
], |
@@ -1548,7 +1546,7 @@ |
'browser/visitedlink_perftest.cc', |
], |
}], |
- ['OS=="win" or (OS=="linux" and toolkit_views==1)', { |
+ ['OS=="win" or (OS=="linux" and (toolkit_views==1 or chromeos==1))', { |
'dependencies': [ |
'../views/views.gyp:views', |
], |