GN: Android perf/tests

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',
@@ skipping 40 matching lines @@
 
   if 'Android' in bot and 'GPU' in bot:
     args.extend(['--useThermalManager', '1,1,10,1000'])
 
   args.extend(['--scales', '1.0', '1.1'])
 
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
   config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui' ]
-  config += [ 'f16', 'srgb' ]
+  if 'AndroidOne' not in bot:
+    config += [ 'f16', 'srgb' ]
   # The S4 crashes and the NP produces a long error stream when we run with
   # MSAA.
   if ('GalaxyS4'    not in bot and
       'NexusPlayer' not in bot):
     if 'Android' in bot:
       # The TegraX1 has a regular OpenGL implementation. We bench that instead
       # of ES.
       if 'TegraX1' in bot:
         config.remove('gpu')
         config.extend(['gl', 'glmsaa4', 'glnvpr4', 'glnvprdit4'])
@@ skipping 156 matching lines @@
   # Copy results to swarming out dir.
   if api.vars.upload_perf_results:
     api.file.makedirs('perf_dir', api.vars.perf_data_dir)
     api.flavor.copy_directory_contents_to_host(
         api.flavor.device_dirs.perf_data_dir,
         api.vars.perf_data_dir)
 
 
 def RunSteps(api):
   api.core.setup()
-  api.flavor.install()
-  perf_steps(api)
-  api.flavor.cleanup_steps()
+  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(
@@ skipping 91 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)
   )