Upstream version 7.36.149.0

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

diff --git a/src/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py b/src/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py
index 7cdb42a..e73eac1 100644 (file)
--- a/src/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py
+++ b/src/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)