diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-09-24 17:27:50 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-09-25 00:28:35 +0000 |
| commit | 4789b6a08a408b687ef8015cd3a760f0b2b08386 (patch) | |
| tree | 7d6c60c5669ffba3ff0e31b9ca331da8adf83218 /testing/chromoting/chromoting_integration_tests.isolate | |
| parent | 673cf0160d7b5e520841a65f4425f8be1a48fbb1 (diff) | |
| download | chromium_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 'testing/chromoting/chromoting_integration_tests.isolate')
| -rw-r--r-- | testing/chromoting/chromoting_integration_tests.isolate | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate index 92dfb74..59afdd5 100644 --- a/testing/chromoting/chromoting_integration_tests.isolate +++ b/testing/chromoting/chromoting_integration_tests.isolate @@ -20,6 +20,12 @@ '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + ], + }, + }], + ['OS=="linux" and use_ozone==0', { + 'variables': { + 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, |