GN: remove old Android recipe code.

infra/bots/recipe_modules/flavor/api.py

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..2a59df8b76cccded5fb93468cfc8fb5566bbe17c 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)
@@ -144,10 +135,7 @@ class SkiaFlavorApi(recipe_api.RecipeApi):
     device_version_file = self.device_path_join(
         self.device_dirs.tmp_dir, version_file)
     if str(actual_version_file) != str(device_version_file):
-      try:
-        device_version = self.read_file_on_device(device_version_file)
-      except self.m.step.StepFailure:
-        device_version = VERSION_NONE

[borenet, 2016/09/19 13:05:15]

Why is this safe to remove?

[mtklein, 2016/09/19 13:06:27]

No bots actually fail now.  I think they just return '/path/to/file not found'
as the "version", which never compares equal to the number we're looking for.

[borenet, 2016/09/19 13:13:22]

Okay, I think I'd prefer to leave in this check since it's something we rely so
heavily on. This can't fail, eg. for iOS?

+      device_version = self.read_file_on_device(device_version_file)
       if device_version != host_version:
         self.remove_file_on_device(device_version_file)
         self.create_clean_device_dir(device_path)