Index: build/android/adb_reverse_forwarder.py |
diff --git a/build/android/adb_reverse_forwarder.py b/build/android/adb_reverse_forwarder.py |
index 700e4e96b274a1ff1a3e50dcff6cb69e51bdff7a..c1d9551542409a8ef97fb8e98020c78324abbc7f 100755 |
--- a/build/android/adb_reverse_forwarder.py |
+++ b/build/android/adb_reverse_forwarder.py |
@@ -15,6 +15,7 @@ import optparse |
import sys |
import time |
+from pylib import android_commands |
from pylib import constants, forwarder |
from pylib.device import device_utils |
from pylib.utils import run_tests_helper |
@@ -50,7 +51,19 @@ def main(argv): |
parser.error('Bad port number') |
sys.exit(1) |
- device = device_utils.DeviceUtils(options.device) |
+ devices = android_commands.GetAttachedDevices() |
+ |
+ if options.device: |
+ if options.device not in devices: |
+ raise Exception('Error: %s not in attached devices %s' % (options.device, |
+ ','.join(devices))) |
+ devices = [options.device] |
+ else: |
+ if not devices: |
+ raise Exception('Error: no connected devices') |
+ print("No device specified. Defaulting to " + devices[0]) |
+ |
+ device = device_utils.DeviceUtils(devices[0]) |
constants.SetBuildType(options.build_type) |
try: |
forwarder.Forwarder.Map(port_pairs, device) |