wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 741989 - Add optional argument to specify adb path, r=jmaher

Browse Source
This commit is contained in:
Jonathan Griffin 2012-04-04 10:27:59 -07:00
parent 648b4d2f3d
commit 2eb680bf9b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/mobile/devicemanagerADB.py
View File

@ -7,7 +7,8 @@ import tempfile
class DeviceManagerADB(DeviceManager):
def __init__(self, host = None, port = 20701, retrylimit = 5, packageName = None):
def __init__(self, host=None, port=20701, retrylimit=5, packageName=None,
adbPath='adb'):
self.host = host
self.port = port
self.retrylimit = retrylimit
@ -20,6 +21,9 @@ class DeviceManagerADB(DeviceManager):
self.packageName = None
self.tempDir = None
# the path to adb, or 'adb' to assume that it's on the PATH
self.adbPath = adbPath
if packageName:
self.packageName = packageName
else:
@ -96,7 +100,7 @@ class DeviceManagerADB(DeviceManager):
cmdline = envstr + "; " + cmdline
# all output should be in stdout
proc = subprocess.Popen(["adb", "shell", cmdline],
proc = subprocess.Popen([self.adbPath, "shell", cmdline],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdout, stderr) = proc.communicate()
outputfile.write(stdout.rstrip('\n'))
@ -674,7 +678,7 @@ class DeviceManagerADB(DeviceManager):
if (not self.haveRoot and self.useRunAs and args[0] == "shell" and args[1] != "run-as"):
args.insert(1, "run-as")
args.insert(2, self.packageName)
args.insert(0, "adb")
args.insert(0, self.adbPath)
return subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
def runCmdAs(self, args):
@ -689,7 +693,7 @@ class DeviceManagerADB(DeviceManager):
if (not self.haveRoot and self.useRunAs and args[0] == "shell" and args[1] != "run-as"):
args.insert(1, "run-as")
args.insert(2, self.packageName)
args.insert(0, "adb")
args.insert(0, self.adbPath)
return subprocess.check_call(args)
def checkCmdAs(self, args):
@ -715,6 +719,10 @@ class DeviceManagerADB(DeviceManager):
def verifyADB(self):
# Check to see if adb itself can be executed.
if self.adbPath != 'adb':
if not os.access(self.adbPath, os.X_OK):
raise DMError("invalid adb path, or adb not executable: %s", self.adbPath)
try:
self.checkCmd(["version"])
except os.error, err: