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

Unified Diff: tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py

Issue 238513003: [Telemetry] Make Telemetry binaries platform aware. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to util/ Created 6 years, 8 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/platform/profiler/oomkiller_profiler.py
diff --git a/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py
index 7cdb42a58468fa937b2a379e8a5b3afdd2745185..e73eac149d79307d0554f3137f6c33e75d926b6f 100644
--- a/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py
+++ b/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py
@@ -4,9 +4,9 @@
import os
-from telemetry.core import util
from telemetry.core.backends.chrome import android_browser_finder
from telemetry.core.platform import profiler
+from telemetry.util import support_binaries
class UnableToFindApplicationException(Exception):
@@ -29,9 +29,8 @@ class OOMKillerProfiler(profiler.Profiler):
browser_backend, platform_backend, output_path, state)
if not 'mem_consumer_launched' in state:
state['mem_consumer_launched'] = True
- mem_consumer_path = util.FindSupportBinary(
- os.path.join('apks', 'MemConsumer.apk'),
- executable=False)
+ mem_consumer_path = support_binaries.FindPath(
+ os.path.join('apks', 'MemConsumer.apk'), 'android')
assert mem_consumer_path, ('Could not find memconsumer app. Please build '
'memconsumer target.')
self._browser_backend.adb.Install(mem_consumer_path)

Powered by Google App Engine
This is Rietveld 408576698