GN: remove old Android recipe code.

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
 
 
 TEST_EXPECTED_SKP_VERSION = '42'
 TEST_EXPECTED_SVG_VERSION = '42'
 TEST_EXPECTED_SK_IMAGE_VERSION = '42'
 
 VERSION_FILE_SK_IMAGE = 'SK_IMAGE_VERSION'
 VERSION_FILE_SKP = 'SKP_VERSION'
 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', '')
 
 
 def is_ios(builder_cfg):
   return ('iOS' in builder_cfg.get('extra_config', '') or
           builder_cfg.get('os') == 'iOS')
 
 
 def is_pdfium(builder_cfg):
   return 'PDFium' in builder_cfg.get('extra_config', '')
 
 
 def is_valgrind(builder_cfg):
   return 'Valgrind' 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):
+    if is_cmake(builder_cfg):
       return cmake_flavor.CMakeFlavorUtils(self.m)
     elif is_ios(builder_cfg):
       return ios_flavor.iOSFlavorUtils(self.m)
     elif is_pdfium(builder_cfg):
       return pdfium_flavor.PDFiumFlavorUtils(self.m)
     elif is_valgrind(builder_cfg):
       return valgrind_flavor.ValgrindFlavorUtils(self.m)
     elif builder_cfg.get('configuration') == 'Coverage':
       return coverage_flavor.CoverageFlavorUtils(self.m)
     else:
@@ skipping 57 matching lines @@
     return self._f.cleanup_steps()
 
   def _copy_dir(self, host_version, version_file, tmp_dir,
                 host_path, device_path, test_expected_version,
                 test_actual_version):
     actual_version_file = self.m.path.join(tmp_dir, version_file)
     # Copy to device.
     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)
         self.copy_directory_contents_to_device(
             host_path, device_path)
 
         # Copy the new version file.
         self.copy_file_to_device(actual_version_file, device_version_file)
 
   def _copy_images(self):
@@ skipping 65 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