Index: infra/bots/recipe_modules/flavor/api.py |
diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py |
index 21ee590dc592a1831a13d57d573a501fc99c6b76..439dee898196b6c2f0a6d1675ea8633dbb974020 100644 |
--- a/infra/bots/recipe_modules/flavor/api.py |
+++ b/infra/bots/recipe_modules/flavor/api.py |
@@ -8,7 +8,6 @@ |
from recipe_engine import recipe_api |
-from . import android_flavor |
from . import cmake_flavor |
from . import coverage_flavor |
from . import default_flavor |
@@ -30,12 +29,6 @@ VERSION_FILE_SVG = 'SVG_VERSION' |
VERSION_NONE = -1 |
-def is_android(builder_cfg): |
- """Determine whether the given builder is an Android builder.""" |
- return ('Android' in builder_cfg.get('extra_config', '') or |
- builder_cfg.get('os') == 'Android') |
- |
- |
def is_cmake(builder_cfg): |
return 'CMake' in builder_cfg.get('extra_config', '') |
@@ -64,9 +57,7 @@ class SkiaFlavorApi(recipe_api.RecipeApi): |
if gn.supported(): |
return gn |
- if is_android(builder_cfg): |
- return android_flavor.AndroidFlavorUtils(self.m) |
- elif is_cmake(builder_cfg): |
+ if is_cmake(builder_cfg): |
return cmake_flavor.CMakeFlavorUtils(self.m) |
elif is_ios(builder_cfg): |
return ios_flavor.iOSFlavorUtils(self.m) |