Chromium Code Reviews| Index: tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py |
| diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py |
| index 2a8fd9fce10ff71ce973f03882b378d8afb1db27..70b6cc61814b083a27119f290d6c798426769eb8 100644 |
| --- a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py |
| +++ b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper.py |
| @@ -225,10 +225,11 @@ def PrepareDeviceForPerf(device): |
| Returns: |
| The path to the installed perf binary on the device. |
| """ |
| - android_prebuilt_profiler_helper.InstallOnDevice(device, 'perf') |
| + perf_binary = 'perf_' + device.GetProp('ro.product.cpu.abi') |
|
tonyg
2014/10/10 16:51:14
This is a general problem, not specific to the per
pasko
2014/10/10 17:04:07
Oops, I also recently added perfhost_precise and p
|
| + android_prebuilt_profiler_helper.InstallOnDevice(device, perf_binary) |
| # Make sure kernel pointers are not hidden. |
| device.WriteFile('/proc/sys/kernel/kptr_restrict', '0', as_root=True) |
| - return android_prebuilt_profiler_helper.GetDevicePath('perf') |
| + return android_prebuilt_profiler_helper.GetDevicePath(perf_binary) |
| def GetToolchainBinaryPath(library_file, binary_name): |