| Index: build/android/pylib/valgrind_tools.py
|
| diff --git a/build/android/pylib/valgrind_tools.py b/build/android/pylib/valgrind_tools.py
|
| index 22ac39b4ba2247a76e25e93fdfcde3dcbba4185d..e6573b4df96ca244f994d0d40e16d7255c71b8ff 100644
|
| --- a/build/android/pylib/valgrind_tools.py
|
| +++ b/build/android/pylib/valgrind_tools.py
|
| @@ -28,6 +28,7 @@ import subprocess
|
| import sys
|
|
|
| from pylib.constants import DIR_SOURCE_ROOT
|
| +from pylib.device import device_errors
|
|
|
|
|
| def SetChromeTimeoutScale(device, scale):
|
| @@ -132,7 +133,11 @@ class AddressSanitizerTool(BaseTool):
|
| return self.GetTestWrapper()
|
|
|
| def SetupEnvironment(self):
|
| - self._device.old_interface.EnableAdbRoot()
|
| + try:
|
| + self._device.EnableRoot()
|
| + except device_errors.CommandFailedError:
|
| + # Try to set the timeout scale anyway.
|
| + pass
|
| SetChromeTimeoutScale(self._device, self.GetTimeoutScale())
|
|
|
| def CleanUpEnvironment(self):
|
|
|