diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-03-09 17:12:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-10 00:12:55 +0000 |
| commit | ceeb7432d9a58c80aed82feaf8066105a4815120 (patch) | |
| tree | e00fe7bba447195b16f92a85116e705720bcd229 /ash | |
| parent | bcbfc458e472b390d618791ff033d6730e556cd9 (diff) | |
| download | chromium_src-ceeb7432d9a58c80aed82feaf8066105a4815120.zip chromium_src-ceeb7432d9a58c80aed82feaf8066105a4815120.tar.gz chromium_src-ceeb7432d9a58c80aed82feaf8066105a4815120.tar.bz2 | |
ash: Add missing xdisplaycheck dependency for tests
BUG=465344
TEST=linux_chromium_clobber_rel_ng does not block new ash_unittests from landing
Review URL: https://codereview.chromium.org/985853004
Cr-Commit-Position: refs/heads/master@{#319786}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/BUILD.gn | 2 | ||||
| -rw-r--r-- | ash/ash.gyp | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index 7db48e0..0eae612 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -395,3 +395,5 @@ test("ash_shell_unittests") { deps += [ "//ui/display" ] } } +# When adding support for isolates, please have a look at run-time dependencies +# in the ash_unittests_run target in ash.gyp. diff --git a/ash/ash.gyp b/ash/ash.gyp index 8936918..61a576f 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1291,6 +1291,15 @@ 'sources': [ 'ash_unittests.isolate', ], + 'conditions': [ + ['use_x11==1', + { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + } + ], + ], }, ], }], |