add gn_android_flavor

infra/bots/recipe_modules/flavor/api.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.
 
 
 # pylint: disable=W0201
 
 
 from recipe_engine import recipe_api
 
 from . import android_flavor
 from . import cmake_flavor
 from . import coverage_flavor
 from . import default_flavor
+from . import gn_android_flavor
 from . import gn_flavor
 from . import ios_flavor
 from . import pdfium_flavor
 from . import valgrind_flavor
 from . import xsan_flavor
 
 
 TEST_EXPECTED_SKP_VERSION = '42'
 TEST_EXPECTED_SVG_VERSION = '42'
 TEST_EXPECTED_SK_IMAGE_VERSION = '42'
@@ skipping 30 matching lines @@
 
 def is_xsan(builder_cfg):
   return ('ASAN' in builder_cfg.get('extra_config', '') or
           'MSAN' in builder_cfg.get('extra_config', '') or
           'TSAN' in builder_cfg.get('extra_config', ''))
 
 
 class SkiaFlavorApi(recipe_api.RecipeApi):
   def get_flavor(self, builder_cfg):
     """Return a flavor utils object specific to the given builder."""
+    gn_android = gn_android_flavor.GNAndroidFlavorUtils(self.m)
+    if gn_android.supported():
+      return gn_android
+
     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_ios(builder_cfg):
       return ios_flavor.iOSFlavorUtils(self.m)
@@ skipping 155 matching lines @@
         version,
         VERSION_FILE_SVG,
         self.m.vars.tmp_dir,
         self.m.vars.local_svg_dir,
         self.device_dirs.svg_dir,
         test_expected_version=self.m.properties.get(
             'test_downloaded_svg_version', TEST_EXPECTED_SVG_VERSION),
         test_actual_version=self.m.properties.get(
             'test_downloaded_svg_version', TEST_EXPECTED_SVG_VERSION))
     return version