tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py - Issue 1233643004: Revert of [Android] Remove adb_commands from telemetry. (Reland)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1233643004: Revert of [Android] Remove adb_commands from telemetry. (Reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« no previous file with comments | « tools/telemetry/telemetry/core/platform/profiler/netlog_profiler.py ('k') | tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a3c2639336a218d3d1b9e61a618f0771ddff2ad1..be4643da6856b54a83caef13df26ff75507e531f 100644

--- a/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py

+++ b/tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py

@@ -32,7 +32,7 @@

browser_backend, platform_backend, output_path, state)

if not 'mem_consumer_launched' in state:

state['mem_consumer_launched'] = True

- arch_name = self._browser_backend.device.product_cpu_abi

+ arch_name = self._browser_backend.adb.device().GetABI()

mem_consumer_path = support_binaries.FindPath(

os.path.join('apks', 'MemConsumer.apk'), arch_name, 'android')

assert mem_consumer_path, ('Could not find memconsumer app. Please build '

@@ -40,12 +40,12 @@

if not self._platform_backend.CanLaunchApplication(

'org.chromium.memconsumerg'):

self._platform_backend.InstallApplication(mem_consumer_path)

- self._browser_backend.device.GoHome()

+ self._browser_backend.adb.device().GoHome()

self._platform_backend.LaunchApplication(

'org.chromium.memconsumer/.MemConsumer',

'--ei memory 20')

# Bring the browser to the foreground after launching the mem consumer

- self._browser_backend.device.StartActivity(

+ self._browser_backend.adb.device().StartActivity(

intent.Intent(package=browser_backend.package,

activity=browser_backend.activity),

blocking=True)

@@ -62,7 +62,7 @@

@classmethod

def WillCloseBrowser(cls, browser_backend, platform_backend):

- browser_backend.device.ForceStop('org.chromium.memconsumer')

+ browser_backend.adb.device().ForceStop('org.chromium.memconsumer')

def CollectProfile(self):

missing_applications = self._MissingApplications()