Revert of Enable viewer in non-Vulkan builds

gyp/most.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Build ALMOST everything provided by Skia; this should be the default target.
 #
 # This omits the following targets that many developers won't want to build:
 # - debugger: this requires QT to build
 #
 {
   'variables': {
     'skia_skip_gui%': 0,
   },
   'targets': [
     {
       'target_name': 'most',
       'type': 'none',
       'dependencies': [
         # The minimal set of static libraries for basic Skia functionality.
         'skia_lib.gyp:skia_lib',
 
         'bench.gyp:*',
         'example.gyp:HelloWorld',
         'SampleApp.gyp:SampleApp',
         'tools.gyp:tools',
         'pathops_unittest.gyp:*',
         'pathops_skpclip.gyp:*',
         'dm.gyp:dm',
         'fuzz.gyp:fuzz',
+        'viewer.gyp:viewer',
       ],
       'conditions': [
         [ 'skia_gpu == 0', {
           'dependencies!': [
             'viewer.gyp:viewer',
           ]
         }],
         [ 'skia_gpu == 0 or skia_os == "android"', {
           'dependencies!': [
             'example.gyp:HelloWorld',
@@ skipping 14 matching lines @@
         ['skia_os == "mac" or skia_os == "linux"', {
           'dependencies': [ 
             'nanomsg.gyp:*' ,
           ],
         }],
         ['skia_os in ["linux", "mac", "win"]', {
           'dependencies': [
             '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',
           ],
         }],
         [ 'skia_skip_gui',
           {
             'dependencies!': [
               'example.gyp:HelloWorld',
               'SampleApp.gyp:SampleApp',
             ]
           }
         ],
       ],
     },
   ],
 }