Update gn_android_flavor for Vulkan.

infra/bots/recipe_modules/flavor/gn_android_flavor.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import default_flavor
 import subprocess
 
 """GN Android flavor utils, used for building Skia for Android with GN."""
 class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, m):
     super(GNAndroidFlavorUtils, self).__init__(m)
     self._ever_ran_adb = False
 
     prefix = '/data/local/tmp/'
     self.device_dirs = default_flavor.DeviceDirs(
         dm_dir        = prefix + 'dm_out',
         perf_data_dir = prefix + 'perf',
         resource_dir  = prefix + 'resources',
         images_dir    = prefix + 'images',
         skp_dir       = prefix + 'skps',
         svg_dir       = prefix + 'svgs',
         tmp_dir       = prefix + 'tmp')
 
   def supported(self):
-    return 'GN_Android' == self.m.vars.builder_cfg.get('extra_config', '')
+    return 'GN_Android' in self.m.vars.builder_cfg.get('extra_config', '')
 
   def _run(self, title, *cmd, **kwargs):
     self.m.vars.default_env = {k: v for (k,v)
                                in self.m.vars.default_env.iteritems()
                                if k in ['PATH']}
     return self.m.run(self.m.step, title, cmd=list(cmd),
                       cwd=self.m.vars.skia_dir, env={}, **kwargs)
 
   def _adb(self, title, *cmd, **kwargs):
     self._ever_ran_adb = True
     # The only non-infra adb call (check rc) happens to not use _adb().
     if 'infra_step' not in kwargs:
       kwargs['infra_step'] = True
     return self._run(title, 'adb', *cmd, **kwargs)
 
   def compile(self, unused_target, **kwargs):
     compiler      = self.m.vars.builder_cfg.get('compiler')
     configuration = self.m.vars.builder_cfg.get('configuration')
+    extra_config  = self.m.vars.builder_cfg.get('extra_config', '')
     os            = self.m.vars.builder_cfg.get('os')
     target_arch   = self.m.vars.builder_cfg.get('target_arch')
 
     assert compiler == 'Clang'  # At this rate we might not ever support GCC.
 
     ndk_asset = 'android_ndk_linux' if os == 'Ubuntu' else 'android_ndk_darwin'
 
     quote = lambda x: '"%s"' % x
-    gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in sorted({
-        'is_debug': 'true' if configuration == 'Debug' else 'false',
+    args = {
         'ndk': quote(self.m.vars.slave_dir.join(ndk_asset)),
         'target_cpu': quote(target_arch),
-    }.iteritems()))
+    }
+
+    if configuration != 'Debug':
+      args['is_debug'] = 'false'
+    if 'Vulkan' in extra_config:
+      args['skia_use_vulkan'] = 'true'
+      args['ndk_api'] = 24
+
+    gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in sorted(args.iteritems()))
 
     self._run('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn'),
               infra_step=True)
     self._run('gn gen', 'gn', 'gen', self.out_dir, '--args=' + gn_args)
     self._run('ninja', 'ninja', '-C', self.out_dir)
 
   def install(self):
     self._adb('mkdir /data/local/tmp/resources',
               'shell', 'mkdir', '-p', '/data/local/tmp/resources')
 
@@ skipping 53 matching lines @@
   def read_file_on_device(self, path):
     return self._adb('read %s' % path,
                      'shell', 'cat', path, stdout=self.m.raw_io.output()).stdout
 
   def remove_file_on_device(self, path):
     self._adb('rm %s' % path, 'shell', 'rm', '-f', path)
 
   def create_clean_device_dir(self, path):
     self._adb('rm %s' % path, 'shell', 'rm', '-rf', path)
     self._adb('mkdir %s' % path, 'shell', 'mkdir', '-p', path)