summaryrefslogtreecommitdiffstats
path: root/chrome/interactive_ui_tests.isolate
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2014-09-24 17:27:50 -0700
committerJohn Abd-El-Malek <jam@chromium.org>2014-09-25 00:28:35 +0000
commit4789b6a08a408b687ef8015cd3a760f0b2b08386 (patch)
tree7d6c60c5669ffba3ff0e31b9ca331da8adf83218 /chrome/interactive_ui_tests.isolate
parent673cf0160d7b5e520841a65f4425f8be1a48fbb1 (diff)
downloadchromium_src-4789b6a08a408b687ef8015cd3a760f0b2b08386.zip
chromium_src-4789b6a08a408b687ef8015cd3a760f0b2b08386.tar.gz
chromium_src-4789b6a08a408b687ef8015cd3a760f0b2b08386.tar.bz2
Fix ChromeOS Ozone build since it doesn't have xdisplaycheck.
BUG=414808 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/599863003 Cr-Commit-Position: refs/heads/master@{#296590}
Diffstat (limited to 'chrome/interactive_ui_tests.isolate')
-rw-r--r--chrome/interactive_ui_tests.isolate8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index b5595bf..0ebf5f1 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -15,13 +15,19 @@
'../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
- '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/pyproto/',
],
},
}],
+ ['OS=="linux" and use_ozone==0', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'isolate_dependency_tracked': [