| Index: tools/telemetry/telemetry/core/backends/adb_commands.py
|
| diff --git a/tools/telemetry/telemetry/core/backends/adb_commands.py b/tools/telemetry/telemetry/core/backends/adb_commands.py
|
| index ffa307ef35f6741386d1e69ac2a5e1d97e3d87d2..9cc9d25282dc7d77af0a5201b08cb7235c687fe0 100644
|
| --- a/tools/telemetry/telemetry/core/backends/adb_commands.py
|
| +++ b/tools/telemetry/telemetry/core/backends/adb_commands.py
|
| @@ -87,7 +87,7 @@ class AdbCommands(object):
|
| self._device.Install(apk_path)
|
|
|
| def IsUserBuild(self):
|
| - return self._device.old_interface.GetBuildType() == 'user'
|
| + return self._device.GetProp('ro.build.type') == 'user'
|
|
|
|
|
| def GetBuildTypeOfPath(path):
|
| @@ -121,7 +121,7 @@ def SetupPrebuiltTools(adb):
|
| if platform.GetHostPlatform().GetOSName() == 'linux':
|
| host_tools.append('host_forwarder')
|
|
|
| - has_device_prebuilt = adb.system_properties['ro.product.cpu.abi'].startswith(
|
| + has_device_prebuilt = adb.device().GetProp('ro.product.cpu.abi').startswith(
|
| 'armeabi')
|
| if not has_device_prebuilt:
|
| return all([support_binaries.FindLocallyBuiltPath(t) for t in device_tools])
|
|
|