trunk/src/build/android/chrome_profiler/chrome_controller.py - Issue 330713002: Revert 276779 "Move adb_profile_chrome under tools/android/"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/build/android/chrome_profiler/chrome_controller.py

Issue 330713002: Revert 276779 "Move adb_profile_chrome under tools/android/" (Closed) Base URL: svn://svn.chromium.org/chrome/

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

OLD	NEW
1 # Copyright 2014 The Chromium Authors. All rights reserved.	1 # Copyright 2014 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 import json	5 import json

6 import os	6 import os

7 import re	7 import re

8 import time	8 import time

9	9

10 from chrome_profiler import controllers	10 from chrome_profiler import controllers

(...skipping 82 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93 [_HEAP_PROFILE_MMAP_PROPERTY] = 0	93 [_HEAP_PROFILE_MMAP_PROPERTY] = 0

94	94

95 def PullTrace(self):	95 def PullTrace(self):

96 # Wait a bit for the browser to finish writing the trace file.	96 # Wait a bit for the browser to finish writing the trace file.

97 time.sleep(self._trace_interval / 4 + 1)	97 time.sleep(self._trace_interval / 4 + 1)

98	98

99 trace_file = self._trace_file.replace('/storage/emulated/0/', '/sdcard/')	99 trace_file = self._trace_file.replace('/storage/emulated/0/', '/sdcard/')

100 host_file = os.path.join(os.path.curdir, os.path.basename(trace_file))	100 host_file = os.path.join(os.path.curdir, os.path.basename(trace_file))

101 self._device.old_interface.PullFileFromDevice(trace_file, host_file)	101 self._device.old_interface.PullFileFromDevice(trace_file, host_file)

102 return host_file	102 return host_file

OLD	NEW