summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChun-Ta Lin <itspeter@google.com>2016-11-17 00:51:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-17 00:51:19 +0000
commita2c0c6be9d0cad1740e7fb69b07edabed00c2e42 (patch)
tree129fcddfc5279bd83b6d92b65c09b43008fc7de3 /android
parentac5e3c7c2d8c4eefcd6099a6311a9a11fe2f7695 (diff)
parent7e2d9f83ff4b2449938e2bef0e8de439bd553c56 (diff)
downloadVK-GL-CTS-a2c0c6be9d0cad1740e7fb69b07edabed00c2e42.tar.gz
VK-GL-CTS-a2c0c6be9d0cad1740e7fb69b07edabed00c2e42.tar.bz2
VK-GL-CTS-a2c0c6be9d0cad1740e7fb69b07edabed00c2e42.zip
Add the support to device connection via TCP/IP am: 4ccc9fd56c
am: 7e2d9f83ff Change-Id: If4a219377c77d0c121f58a82779da7cc2a4459f8
Diffstat (limited to 'android')
-rw-r--r--android/scripts/common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/scripts/common.py b/android/scripts/common.py
index 7940f4a95..16b527684 100644
--- a/android/scripts/common.py
+++ b/android/scripts/common.py
@@ -173,7 +173,7 @@ def getDevices (adb):
if proc.returncode != 0:
raise Exception("adb devices -l failed, got %d" % proc.returncode)
- ptrn = re.compile(r'^([a-zA-Z0-9]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)')
+ ptrn = re.compile(r'^([a-zA-Z0-9:]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)')
devices = []
for line in stdout.splitlines()[1:]:
if len(line.strip()) == 0: