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

Side by Side Diff: mojo/devtools/common/devtoolslib/android_shell.py

Issue 1460213002: Add default file for command line arguments. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Follow live discussion Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | shell/android/apk/src/org/chromium/mojo/shell/ShellService.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 atexit 5 import atexit
6 import hashlib 6 import hashlib
7 import logging 7 import logging
8 import os 8 import os
9 import os.path 9 import os.path
10 import random 10 import random
11 import re 11 import re
12 import subprocess 12 import subprocess
13 import sys 13 import sys
14 import tempfile 14 import tempfile
15 import threading 15 import threading
16 import time 16 import time
17 import uuid 17 import uuid
18 18
19 from devtoolslib import http_server 19 from devtoolslib import http_server
20 from devtoolslib.shell import Shell 20 from devtoolslib.shell import Shell
21 from devtoolslib.utils import overrides 21 from devtoolslib.utils import overrides
22 22
23 23
24 # Tags used by mojo shell Java logging. 24 # Tags used by mojo shell Java logging.
25 _LOGCAT_JAVA_TAGS = [ 25 _LOGCAT_JAVA_TAGS = [
26 'AndroidHandler', 26 'AndroidHandler',
27 'MojoFileHelper', 27 'MojoFileHelper',
28 'MojoMain',
29 'MojoShellActivity',
30 'MojoShellApplication', 28 'MojoShellApplication',
29 'ShellService',
31 ] 30 ]
32 31
33 _MOJO_SHELL_PACKAGE_NAME = 'org.chromium.mojo.shell' 32 _MOJO_SHELL_PACKAGE_NAME = 'org.chromium.mojo.shell'
34 33
35 # Used to parse the output of `adb devices`. 34 # Used to parse the output of `adb devices`.
36 _ADB_DEVICES_HEADER = 'List of devices attached' 35 _ADB_DEVICES_HEADER = 'List of devices attached'
37 36
38 37
39 _logger = logging.getLogger() 38 _logger = logging.getLogger()
40 39
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 Results.output = rf.read() 428 Results.output = rf.read()
430 429
431 run_thread = threading.Thread(target=do_run) 430 run_thread = threading.Thread(target=do_run)
432 run_thread.start() 431 run_thread.start()
433 run_thread.join(timeout) 432 run_thread.join(timeout)
434 433
435 if run_thread.is_alive(): 434 if run_thread.is_alive():
436 self.stop_shell() 435 self.stop_shell()
437 return None, Results.output, True 436 return None, Results.output, True
438 return None, Results.output, False 437 return None, Results.output, False
OLDNEW
« no previous file with comments | « no previous file | shell/android/apk/src/org/chromium/mojo/shell/ShellService.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698