Fixed extraction of emulated devices name

build/android/adb_logcat_monitor.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Saves logcats from all connected devices.
 
 Usage: adb_logcat_monitor.py <base_dir> [<adb_binary_path>]
 
@@ skipping 65 matching lines @@
   Returns:
     list of devices or an empty list on timeout
   """
   signal.alarm(2)
   try:
     out, err = subprocess.Popen([adb_cmd, 'devices'],
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE).communicate()
     if err:
       logging.warning('adb device error %s', err.strip())
-    return re.findall('^(\w+)\tdevice$', out, re.MULTILINE)
+    return re.findall('^(\S+)\tdevice$', out, re.MULTILINE)
   except TimeoutException:
     logging.warning('"adb devices" command timed out')
     return []
   except (IOError, OSError):
     logging.exception('Exception from "adb devices"')
     return []
   finally:
     signal.alarm(0)
 
 
@@ skipping 50 matching lines @@
           pass
     os.remove(pid_file_path)
 
 
 if __name__ == '__main__':
   if 2 <= len(sys.argv) <= 3:
     print 'adb_logcat_monitor: Initializing'
     sys.exit(main(*sys.argv[1:3]))
 
   print 'Usage: %s <base_dir> [<adb_binary_path>]' % sys.argv[0]