summaryrefslogtreecommitdiffstats
path: root/base
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 /base
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 'base')
-rw-r--r--base/base_unittests.isolate6
1 files changed, 6 insertions, 0 deletions
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index 61b2b04..a7a0723 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -21,6 +21,12 @@
],
'isolate_dependency_tracked': [
'../testing/xvfb.py',
+ ],
+ },
+ }],
+ ['OS=="linux" and use_ozone==0', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},