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

Side by Side Diff: build/android/gyp/util/build_device.py

Issue 1290173003: [Android] Reland of Remove android_commands and android_testrunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed: removed references from content/telemetry.isolate and TELEMETRY_DEPS Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « build/android/PRESUBMIT.py ('k') | build/android/provision_devices.py » ('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 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 from util import build_utils 14 from util import build_utils
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.device import adb_wrapper
20 from pylib.device import device_errors 20 from pylib.device import device_errors
21 from pylib.device import device_utils 21 from pylib.device import device_utils
22 22
23 GetAttachedDevices = android_commands.GetAttachedDevices 23
24 def GetAttachedDevices():
25 return [a.GetDeviceSerial()
26 for a in adb_wrapper.Devices()]
24 27
25 28
26 class BuildDevice(object): 29 class BuildDevice(object):
27 def __init__(self, configuration): 30 def __init__(self, configuration):
28 self.id = configuration['id'] 31 self.id = configuration['id']
29 self.description = configuration['description'] 32 self.description = configuration['description']
30 self.install_metadata = configuration['install_metadata'] 33 self.install_metadata = configuration['install_metadata']
31 self.device = device_utils.DeviceUtils(self.id) 34 self.device = device_utils.DeviceUtils(self.id)
32 35
33 def RunShellCommand(self, *args, **kwargs): 36 def RunShellCommand(self, *args, **kwargs):
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 assert len(configurations) == 1 102 assert len(configurations) == 1
100 return BuildDevice(configurations[0]) 103 return BuildDevice(configurations[0])
101 104
102 105
103 def GetBuildDeviceFromPath(path): 106 def GetBuildDeviceFromPath(path):
104 configurations = ReadConfigurations(path) 107 configurations = ReadConfigurations(path)
105 if len(configurations) > 0: 108 if len(configurations) > 0:
106 return GetBuildDevice(ReadConfigurations(path)) 109 return GetBuildDevice(ReadConfigurations(path))
107 return None 110 return None
108 111
OLDNEW
« no previous file with comments | « build/android/PRESUBMIT.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698