GN: remove old Android recipe code.

infra/bots/recipes/swarm_perf.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.
 
 
 # Recipe module for Skia Swarming perf.
 
 
 DEPS = [
   'build/file',
   'core',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/raw_io',
   'run',
   'flavor',
   'vars',
 ]
 
 
 TEST_BUILDERS = {
   'client.skia': {
     'skiabot-linux-swarm-000': [
-      'Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release',
-      'Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan',
-      'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug',
-      'Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release',
-      'Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
-      'Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release',
+      ('Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug' +
+       '-GN_Android_Vulkan'),
+      'Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android',
+      'Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android',
+      'Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android',
+      'Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android',
       'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN',
       'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
       'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
       'Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
     ],
   },
@@ skipping 78 matching lines @@
   # so defensively disable them in nanobench, too.
   # FIXME (scroggo): This may have just been due to SkImageDecoder's
   # buildTileIndex leaking memory (https://bug.skia.org/4360). That is
   # disabled by default for nanobench, so we may not need this.
   # FIXME (scroggo): Share image blacklists between dm and nanobench?
   if 'x86' in bot and not 'x86-64' in bot:
     match.append('~interlaced1.png')
     match.append('~interlaced2.png')
     match.append('~interlaced3.png')
 
-  # This low-end Android bot crashes about 25% of the time while running the
-  # (somewhat intense) shapes benchmarks.
-  if 'Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release' in bot:
-    match.append('~shapes_')
-
   # We do not need or want to benchmark the decodes of incomplete images.
   # In fact, in nanobench we assert that the full image decode succeeds.
   match.append('~inc0.gif')
   match.append('~inc1.gif')
   match.append('~incInterlaced.gif')
   match.append('~inc0.jpg')
   match.append('~incGray.jpg')
   match.append('~inc0.wbmp')
   match.append('~inc1.wbmp')
   match.append('~inc0.webp')
@@ skipping 95 matching lines @@
   api.core.setup()
   try:
     api.flavor.install()
     perf_steps(api)
   finally:
     api.flavor.cleanup_steps()
   api.run.check_failure()
 
 
 def GenTests(api):
-  def AndroidTestData(builder):
-    test_data = (
-        api.step_data(
-            'get EXTERNAL_STORAGE dir',
-            stdout=api.raw_io.output('/storage/emulated/legacy')) +
-        api.step_data(
-            'read SKP_VERSION',
-            stdout=api.raw_io.output('42')) +
-        api.step_data(
-            'read SK_IMAGE_VERSION',
-            stdout=api.raw_io.output('42')) +
-        api.step_data(
-            'read SVG_VERSION',
-            stdout=api.raw_io.output('42')) +
-        api.step_data(
-            'which adb',
-            retcode=1)
-    )
-    if not 'Debug' in builder:
-      test_data += api.step_data(
-          'exists skia_perf',
-          stdout=api.raw_io.output(''))
-    if not 'GalaxyS3' in builder:
-      test_data += api.step_data(
-          'adb root',
-          stdout=api.raw_io.output('restarting adbd as root'))
-    return test_data
-
   for mastername, slaves in TEST_BUILDERS.iteritems():
     for slavename, builders_by_slave in slaves.iteritems():
       for builder in builders_by_slave:
         test = (
           api.test(builder) +
           api.properties(buildername=builder,
                          mastername=mastername,
                          slavename=slavename,
                          buildnumber=5,
                          revision='abc123',
                          path_config='kitchen',
                          swarm_out_dir='[SWARM_OUT_DIR]') +
           api.path.exists(
               api.path['slave_build'].join('skia'),
               api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                            'skimage', 'VERSION'),
               api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                            'skp', 'VERSION'),
               api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
           )
         )
-        if ('Android' in builder and
-            ('Test' in builder or 'Perf' in builder) and
-            not 'Appurify' in builder):
-          test += AndroidTestData(builder)
         if 'Trybot' in builder:
           test += api.properties(issue=500,
                                  patchset=1,
                                  rietveld='https://codereview.chromium.org')
         if 'Win' in builder:
           test += api.platform('win', 64)
 
         yield test
 
   builder = 'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot'
@@ skipping 34 matching lines @@
           buildername='Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-' +
                       'Valgrind-Trybot',
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           swarm_out_dir='[SWARM_OUT_DIR]',
           revision='abc123',
           **gerrit_kwargs)
   )