diff options
Diffstat (limited to 'infra/bots/recipe_modules/flavor/api.py')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/api.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py index 1032f64207..609cfd95dc 100644 --- a/infra/bots/recipe_modules/flavor/api.py +++ b/infra/bots/recipe_modules/flavor/api.py @@ -11,7 +11,6 @@ from recipe_engine import recipe_api 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 @@ -30,11 +29,6 @@ def is_android(builder_cfg): return 'Android' in builder_cfg.get('extra_config', '') -def is_ios(builder_cfg): - return ('iOS' == builder_cfg.get('extra_config', '') or - builder_cfg.get('os') == 'iOS') - - def is_pdfium(builder_cfg): return 'PDFium' in builder_cfg.get('extra_config', '') @@ -48,8 +42,6 @@ class SkiaFlavorApi(recipe_api.RecipeApi): """Return a flavor utils object specific to the given builder.""" if is_android(builder_cfg): return gn_android_flavor.GNAndroidFlavorUtils(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): @@ -130,8 +122,8 @@ class SkiaFlavorApi(recipe_api.RecipeApi): 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 + except self.m.step.StepFailure: # pragma: nocover + device_version = VERSION_NONE # pragma: nocover if device_version != host_version: self.remove_file_on_device(device_version_file) self.create_clean_device_dir(device_path) |