[Android] Root devices before asan_device_setup.sh.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 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.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import sys
@@ skipping 543 matching lines @@
       for d in devices:
         install_cmd += ['-d', d]
     if allow_downgrade:
       install_cmd.append('--downgrade')
     if self.m.chromium.c.BUILD_CONFIG == 'Release':
       install_cmd.append('--release')
     return self.m.step('install ' + self.m.path.basename(apk), install_cmd,
                        infra_step=True,
                        env=self.m.chromium.get_env())
 
-  def _asan_device_setup(self, name, args):
+  def _asan_device_setup(self, args):
     script = self.m.path['checkout'].join(
         'tools', 'android', 'asan', 'third_party', 'asan_device_setup.sh')
     cmd = [script] + args
     env = dict(self.m.chromium.get_env())
     env['ADB'] = self.m.adb.adb_path()
     for d in self.devices:
-      self.m.step('%s %s' % (name, d),
+      self.m.step(d,
                   cmd + ['--device', d],
                   infra_step=True,
                   env=env)
 
   def asan_device_setup(self):
-    args = [
-        '--lib',
-        self.m.path['checkout'].join(
-            'third_party', 'llvm-build', 'Release+Asserts', 'lib', 'clang',
-            # TODO(kjellander): Don't hardcode the clang version number here,
-            # else the bot will break every time it changes.  Instead,
-            # get it from `tools/clang/scripts/update.py --print-clang-version`,
-            # then the version can be updated atomically with a src-side change
-            # in clang rolls, instead of it being both in src/ and build/.
-            '3.9.0', 'lib', 'linux', 'libclang_rt.asan-arm-android.so')
-    ]
-    self._asan_device_setup('Set up ASAN on device', args)
+    with self.m.step.nest('Set up ASAN on devices'):
+      self.m.adb.root_devices()
+      args = [
+          '--lib',
+          self.m.path['checkout'].join(
+              'third_party', 'llvm-build', 'Release+Asserts', 'lib', 'clang',
+              # TODO(kjellander): Don't hardcode the clang version number here,
+              # else the bot will break every time it changes.  Instead,
+              # get it from `tools/clang/scripts/update.py --print-clang-version`,
+              # then the version can be updated atomically with a src-side change
+              # in clang rolls, instead of it being both in src/ and build/.
+              '3.9.0', 'lib', 'linux', 'libclang_rt.asan-arm-android.so')
+      ]
+      self._asan_device_setup(args)
 
   def asan_device_teardown(self):
-    self._asan_device_setup('Tear down ASAN on device', ['--revert'])
+    with self.m.step.nest('Tear down ASAN on devices'):
+      self._asan_device_setup(['--revert'])
 
   def monkey_test(self, **kwargs):
     args = [
         'monkey',
         '-v',
         '--package=%s' % self.c.channel,
         '--event-count=50000',
         '--blacklist-file', self.blacklist_file,
     ]
     return self.test_runner(
@@ skipping 804 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)