Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / platform / profiler / android_prebuilt_profiler_helper.py

diff --git a/src/tools/telemetry/telemetry/core/platform/profiler/android_prebuilt_profiler_helper.py b/src/tools/telemetry/telemetry/core/platform/profiler/android_prebuilt_profiler_helper.py
index d2c87c6..5974f1d 100644 (file)
--- a/src/tools/telemetry/telemetry/core/platform/profiler/android_prebuilt_profiler_helper.py
+++ b/src/tools/telemetry/telemetry/core/platform/profiler/android_prebuilt_profiler_helper.py
@@ -19,13 +19,14 @@ def GetDevicePath(profiler_binary):
 
 @decorators.Cache
 def InstallOnDevice(device, profiler_binary):
-  host_path = support_binaries.FindPath(profiler_binary, 'android')
+  arch_name = device.GetABI()
+  host_path = support_binaries.FindPath(profiler_binary, arch_name, 'android')
   if not host_path:
     logging.error('Profiler binary "%s" not found. Could not be installed',
                   host_path)
     return False
 
   device_binary_path = GetDevicePath(profiler_binary)
-  device.PushChangedFiles(host_path, device_binary_path)
+  device.PushChangedFiles([(host_path, device_binary_path)])
   device.RunShellCommand('chmod 777 ' + device_binary_path)
   return True