2 files changed, 41 insertions, 42 deletions

diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py
index 83a3484bf7..0e8411de63 100644
--- a/infra/bots/recipe_modules/flavor/api.py
+++ b/infra/bots/recipe_modules/flavor/api.py
@@ -38,10 +38,6 @@ def is_cmake(builder_cfg):
   return 'CMake' in builder_cfg.get('extra_config', '')
 
 
-def is_gn(builder_cfg):
-  return 'GN' == builder_cfg.get('extra_config', '')
-
-
 def is_ios(builder_cfg):
   return ('iOS' in builder_cfg.get('extra_config', '') or
           builder_cfg.get('os') == 'iOS')
@@ -64,12 +60,14 @@ def is_xsan(builder_cfg):
 class SkiaFlavorApi(recipe_api.RecipeApi):
   def get_flavor(self, builder_cfg):
     """Return a flavor utils object specific to the given builder."""
+    gn = gn_flavor.GNFlavorUtils(self.m)
+    if gn.supported():
+      return gn
+
     if is_android(builder_cfg):
       return android_flavor.AndroidFlavorUtils(self.m)
     elif is_cmake(builder_cfg):
       return cmake_flavor.CMakeFlavorUtils(self.m)
-    elif is_gn(builder_cfg):
-      return gn_flavor.GNFlavorUtils(self.m)
     elif is_ios(builder_cfg):
       return ios_flavor.iOSFlavorUtils(self.m)
     elif is_pdfium(builder_cfg):
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index 019967748b..ef25896569 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -6,50 +6,51 @@ import default_flavor
 
 """GN flavor utils, used for building Skia with GN."""
 class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
-  def compile(self, target, **kwargs):
-    """Build Skia with GN."""
-    # Get the gn executable.
-    fetch_gn = self.m.vars.skia_dir.join('bin', 'fetch-gn')
-    self.m.run(self.m.step, 'fetch-gn',
-               cmd=[fetch_gn],
-               cwd=self.m.vars.skia_dir,
-               **kwargs)
+  def supported(self):
+    extra_config = self.m.vars.builder_cfg.get('extra_config', '')
+
+    return any([
+      extra_config == 'GN',
+      extra_config == 'Fast',
+      extra_config.startswith('SK')
+    ])
 
-    is_debug = 'is_debug=true'
-    if self.m.vars.configuration != 'Debug':
-      is_debug = 'is_debug=false'
-    gn_args = [is_debug]
+  def compile(self, unused_target, **kwargs):
+    """Build Skia with GN."""
+    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',  '')
 
-    is_clang = 'Clang' in self.m.vars.builder_name
-    is_gcc   = 'GCC'   in self.m.vars.builder_name
+    gn_args = []
+    if configuration != 'Debug':
+      gn_args.append('is_debug=false')
 
     cc, cxx = 'cc', 'c++'
-    if is_clang:
+    cflags = []
+
+    if compiler == 'Clang':
       cc, cxx = 'clang', 'clang++'
-    elif is_gcc:
+    elif compiler == 'GCC':
       cc, cxx = 'gcc', 'g++'
 
     ccache = self.m.run.ccache()
     if ccache:
       cc, cxx = '%s %s' % (ccache, cc), '%s %s' % (ccache, cxx)
-      if is_clang:
+      if compiler == 'Clang':
         # Stifle "argument unused during compilation: ..." warnings.
-        stifle = '-Qunused-arguments'
-        cc, cxx = '%s %s' % (cc, stifle), '%s %s' % (cxx, stifle)
-
-    gn_args += [ 'cc="%s"' % cc, 'cxx="%s"' % cxx ]
-
-    # Run gn gen.
-    gn_exe = 'gn'
-    if self.m.platform.is_win:
-      gn_exe = 'gn.exe'
-    gn_gen = [gn_exe, 'gen', self.out_dir, '--args=%s' % ' '.join(gn_args)]
-    self.m.run(self.m.step, 'gn_gen', cmd=gn_gen,
-               cwd=self.m.vars.skia_dir, **kwargs)
-
-    # Run ninja.
-    ninja_cmd = ['ninja', '-C', self.out_dir]
-    self.m.run(self.m.step, 'compile %s' % target,
-               cmd=ninja_cmd,
-               cwd=self.m.vars.skia_dir,
-               **kwargs)
+        cflags.append('-Qunused-arguments')
+
+    if extra_config == 'Fast':
+      cflags.extend(['-march=native', '-fomit-frame-pointer'])
+    if extra_config.startswith('SK'):
+      cflags.append('-D' + extra_config)
+
+    cflags = ' '.join(cflags)
+    gn_args += [ 'cc="%s %s"' % (cc, cflags), 'cxx="%s %s"' % (cxx, cflags) ]
+
+    run = lambda title, cmd: self.m.run(self.m.step, title, cmd=cmd,
+                                        cwd=self.m.vars.skia_dir, **kwargs)
+
+    run('fetch-gn', [self.m.vars.skia_dir.join('bin', 'fetch-gn')])
+    run('gn gen', ['gn', 'gen', self.out_dir, '--args=%s' % ' '.join(gn_args)])
+    run('ninja', ['ninja', '-C', self.out_dir])