Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Unified Diff: tools/telemetry/telemetry/core/backends/adb_commands.py

Issue 643973002: Add multi-architecture support in telemetry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix trybot failure Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5c722bd39761d84950119502fcd13fea52cf1c57..8bc9341b216bef4a0f51eac21fc0f081c4eecb5d 100644
--- a/tools/telemetry/telemetry/core/backends/adb_commands.py
+++ b/tools/telemetry/telemetry/core/backends/adb_commands.py
@@ -105,8 +105,8 @@ def SetupPrebuiltTools(adb):
if platform.GetHostPlatform().GetOSName() == 'linux':
host_tools.append('host_forwarder')
- has_device_prebuilt = adb.device().GetProp('ro.product.cpu.abi').startswith(
- 'armeabi')
+ arch_name = adb.device().GetABI()
+ has_device_prebuilt = arch_name.startswith('armeabi')
if not has_device_prebuilt:
return all([support_binaries.FindLocallyBuiltPath(t) for t in device_tools])
@@ -124,7 +124,10 @@ def SetupPrebuiltTools(adb):
os.makedirs(os.path.dirname(dest))
platform_name = ('android' if t in device_tools else
platform.GetHostPlatform().GetOSName())
- prebuilt_path = support_binaries.FindPath(executable, platform_name)
+ bin_arch_name = (arch_name if t in device_tools else
+ platform.GetHostPlatform().GetArchName())
+ prebuilt_path = support_binaries.FindPath(
+ executable, bin_arch_name, platform_name)
if not prebuilt_path or not os.path.exists(prebuilt_path):
raise NotImplementedError("""
%s must be checked into cloud storage.
« no previous file with comments | « tools/telemetry/bin/win/winring0.zip.sha1 ('k') | tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698