diff options
| author |  egdaniel <egdaniel@google.com> | 2016-06-15 14:23:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-15 14:23:40 -0700 |
| commit | 963632f686cd642344429f64e6a53262fe592828 (patch) | |
| tree | 97e93302b140b391423e5ba7f356f5c939e7a1f9 /gyp | |
| parent | 363bc334854c5c2c78afd0e4f18c8c95bda5629a (diff) | |
Revert of Enable viewer in non-Vulkan builds (patchset #2 id:20001 of https://codereview.chromium.org/2067023002/ )
Reason for revert:
breaking compile bots
Original issue's description:
> Enable viewer in non-Vulkan builds
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002
>
> Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b
TBR=djsollen@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2072563002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/most.gyp | 5 | ||||
| -rw-r--r-- | gyp/viewer.gyp | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/gyp/most.gyp b/gyp/most.gyp index eb9f6c00f4..47c0d804da 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -27,6 +27,7 @@ 'pathops_skpclip.gyp:*', 'dm.gyp:dm', 'fuzz.gyp:fuzz', + 'viewer.gyp:viewer', ], 'conditions': [ [ 'skia_gpu == 0', { @@ -61,8 +62,8 @@ 'skiaserve.gyp:skiaserve', ], }], - [ 'skia_os in ["win", "linux", "android"]', { - 'dependencies': [ + [ 'skia_vulkan == 0 or (skia_os != "win" and skia_os != "android")', { + 'dependencies!': [ 'viewer.gyp:viewer', ], }], diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp index 0b918d7c1f..1013e070ae 100644 --- a/gyp/viewer.gyp +++ b/gyp/viewer.gyp @@ -79,10 +79,6 @@ 'sources/': [ ['exclude', '_win.(h|cpp)$'], ], }], - ['skia_vulkan == 0', { - 'sources/': [ ['exclude', 'Vulkan'] - ], - }], ], }, ], |