OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 """ A simple device interface for build steps. | 5 """ A simple device interface for build steps. |
6 | 6 |
7 """ | 7 """ |
8 | 8 |
9 import logging | 9 import logging |
10 import os | 10 import os |
11 import re | 11 import re |
12 import sys | 12 import sys |
13 | 13 |
14 import build_utils | 14 import build_utils # pylint: disable=F0401 |
15 | 15 |
16 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..') | 16 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..') |
17 sys.path.append(BUILD_ANDROID_DIR) | 17 sys.path.append(BUILD_ANDROID_DIR) |
18 | 18 |
19 from pylib import android_commands | 19 from pylib import android_commands |
20 | 20 |
21 from pylib.android_commands import GetAttachedDevices | |
22 | |
23 | 21 |
24 class BuildDevice(object): | 22 class BuildDevice(object): |
25 def __init__(self, configuration): | 23 def __init__(self, configuration): |
26 self.id = configuration['id'] | 24 self.id = configuration['id'] |
27 self.description = configuration['description'] | 25 self.description = configuration['description'] |
28 self.install_metadata = configuration['install_metadata'] | 26 self.install_metadata = configuration['install_metadata'] |
29 self.adb = android_commands.AndroidCommands(self.id) | 27 self.adb = android_commands.AndroidCommands(self.id) |
30 | 28 |
31 def RunShellCommand(self, *args, **kwargs): | 29 def RunShellCommand(self, *args, **kwargs): |
32 return self.adb.RunShellCommand(*args, **kwargs) | 30 return self.adb.RunShellCommand(*args, **kwargs) |
(...skipping 12 matching lines...) Expand all Loading... |
45 # Matches lines like: | 43 # Matches lines like: |
46 # -rw-r--r-- system system 7376582 2013-04-19 16:34 \ | 44 # -rw-r--r-- system system 7376582 2013-04-19 16:34 \ |
47 # org.chromium.chrome.testshell.apk | 45 # org.chromium.chrome.testshell.apk |
48 # -rw-r--r-- system system 7376582 2013-04-19 16:34 \ | 46 # -rw-r--r-- system system 7376582 2013-04-19 16:34 \ |
49 # org.chromium.chrome.testshell-1.apk | 47 # org.chromium.chrome.testshell-1.apk |
50 apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?.apk$' % apk_package, s) | 48 apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?.apk$' % apk_package, s) |
51 matches = filter(apk_matcher, self.install_metadata) | 49 matches = filter(apk_matcher, self.install_metadata) |
52 return matches[0] if matches else None | 50 return matches[0] if matches else None |
53 | 51 |
54 | 52 |
55 def GetConfigurationForDevice(id): | 53 def GetConfigurationForDevice(device_id): |
56 adb = android_commands.AndroidCommands(id) | 54 adb = android_commands.AndroidCommands(device_id) |
57 configuration = None | 55 configuration = None |
58 has_root = False | 56 has_root = False |
59 is_online = adb.IsOnline() | 57 is_online = adb.IsOnline() |
60 if is_online: | 58 if is_online: |
61 cmd = 'ls -l /data/app; getprop ro.build.description' | 59 cmd = 'ls -l /data/app; getprop ro.build.description' |
62 cmd_output = adb.RunShellCommand(cmd) | 60 cmd_output = adb.RunShellCommand(cmd) |
63 has_root = not 'Permission denied' in cmd_output[0] | 61 has_root = not 'Permission denied' in cmd_output[0] |
64 if not has_root: | 62 if not has_root: |
65 # Disable warning log messages from EnableAdbRoot() | 63 # Disable warning log messages from EnableAdbRoot() |
66 logging.getLogger().disabled = True | 64 logging.getLogger().disabled = True |
67 has_root = adb.EnableAdbRoot() | 65 has_root = adb.EnableAdbRoot() |
68 logging.getLogger().disabled = False | 66 logging.getLogger().disabled = False |
69 cmd_output = adb.RunShellCommand(cmd) | 67 cmd_output = adb.RunShellCommand(cmd) |
70 | 68 |
71 configuration = { | 69 configuration = { |
72 'id': id, | 70 'id': device_id, |
73 'description': cmd_output[-1], | 71 'description': cmd_output[-1], |
74 'install_metadata': cmd_output[:-1], | 72 'install_metadata': cmd_output[:-1], |
75 } | 73 } |
76 return configuration, is_online, has_root | 74 return configuration, is_online, has_root |
77 | 75 |
78 | 76 |
79 def WriteConfigurations(configurations, path): | 77 def WriteConfigurations(configurations, path): |
80 # Currently we only support installing to the first device. | 78 # Currently we only support installing to the first device. |
81 build_utils.WriteJson(configurations[:1], path, only_if_changed=True) | 79 build_utils.WriteJson(configurations[:1], path, only_if_changed=True) |
82 | 80 |
83 | 81 |
84 def ReadConfigurations(path): | 82 def ReadConfigurations(path): |
85 return build_utils.ReadJson(path) | 83 return build_utils.ReadJson(path) |
86 | 84 |
87 | 85 |
88 def GetBuildDevice(configurations): | 86 def GetBuildDevice(configurations): |
89 assert len(configurations) == 1 | 87 assert len(configurations) == 1 |
90 return BuildDevice(configurations[0]) | 88 return BuildDevice(configurations[0]) |
91 | 89 |
92 | 90 |
93 def GetBuildDeviceFromPath(path): | 91 def GetBuildDeviceFromPath(path): |
94 configurations = ReadConfigurations(path) | 92 configurations = ReadConfigurations(path) |
95 if len(configurations) > 0: | 93 if len(configurations) > 0: |
96 return GetBuildDevice(ReadConfigurations(path)) | 94 return GetBuildDevice(ReadConfigurations(path)) |
97 return None | 95 return None |
98 | 96 |
OLD | NEW |