sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-11-04 07:51:21 +00:00
Code Issues Releases Wiki Activity

module/systrace: Fix platform_tools use

Browse Source 
platform_tools is only updated after the very first connection to the
target, and it will be None until then.

As I understand it, using `from devlib.utils.android import
platform_tools` will create a symbol local to the imported systrace
module for `platform_tools` that just takes its current value,
and it won't be updated when it should be.

Changing the `from x import y` statement to a simple `import x` seems
to counteract this.
This commit is contained in:
Valentin Schneider
2018-10-19 18:18:11 +01:00
committed by Marc Bonnici
parent 6089eaf40a
commit 75332cf14a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devlib/trace/systrace.py
View File

@@ -21,7 +21,7 @@ from tempfile import NamedTemporaryFile
from devlib.exception import TargetStableError, HostError from devlib.exception import TargetStableError, HostError
from devlib.trace import TraceCollector from devlib.trace import TraceCollector
from devlib.utils.android import platform_tools import devlib.utils.android
from devlib.utils.misc import memoized from devlib.utils.misc import memoized
@@ -83,6 +83,7 @@ class SystraceCollector(TraceCollector):
# Try to find a systrace binary # Try to find a systrace binary
self.systrace_binary = None self.systrace_binary = None
platform_tools = devlib.utils.android.platform_tools
systrace_binary_path = os.path.join(platform_tools, 'systrace', 'systrace.py') systrace_binary_path = os.path.join(platform_tools, 'systrace', 'systrace.py')
if not os.path.isfile(systrace_binary_path): if not os.path.isfile(systrace_binary_path):
raise HostError('Could not find any systrace binary under {}'.format(platform_tools)) raise HostError('Could not find any systrace binary under {}'.format(platform_tools))