Updated files

build/android/pylib/local/device/local_device_environment.py

Index: build/android/pylib/local/device/local_device_environment.py
diff --git a/build/android/pylib/local/device/local_device_environment.py b/build/android/pylib/local/device/local_device_environment.py
index 56e867862bcd264e4b36f588afc055945b6c0662..43087d7fda7769144cc0a1bd2c7cf7addae67c91 100644
--- a/build/android/pylib/local/device/local_device_environment.py
+++ b/build/android/pylib/local/device/local_device_environment.py
@@ -44,7 +44,9 @@ class LocalDeviceEnvironment(environment.Environment):
     self._skip_clear_data = args.skip_clear_data
     self._target_devices_file = args.target_devices_file
     self._tool_name = args.tool
-
+    self._logdog_butler_pref = args.logdog_butler_prefix
+    self._logdog_butler_dir = args.logdog_butler_dir
+    self._logdog_butler_project = args.logdog_butler_project
   #override
   def SetUp(self):
     device_arg = 'default'
@@ -73,16 +75,27 @@ class LocalDeviceEnvironment(environment.Environment):
             d.LoadCacheData(f.read())
           # Delete cached file so that any exceptions cause it to be cleared.
           os.unlink(cache_path)
+    # Add in logdog stuff
+    # subprocess.POpen(self._logdog_pref+'logdog_butler', '-project
+    # {0}'.format(self._logdog_butler_project), '-prefix
+    # {0}'.format(self._logdog_butler_pref), '-output', 'logdog',
+
+
     if self._logcat_output_file:
       self._logcat_output_dir = tempfile.mkdtemp()
     if self._logcat_output_dir:
       for d in self._devices:
+        logdog_name = None
+        if self._logdog_butler_pref:
+          logdog_name = 'swarming/device{0}'.format(d.adb.GetDeviceSerial())
         logcat_file = os.path.join(
             self._logcat_output_dir,
             '%s_%s' % (d.adb.GetDeviceSerial(),
                        datetime.datetime.utcnow().strftime('%Y%m%dT%H%M%S')))
         monitor = logcat_monitor.LogcatMonitor(
             d.adb, clear=True, output_file=logcat_file)
+           # logdog_prefix=self._logdog_butler_pref,
+           # logdog_name=logdog_name)
         self._logcat_monitors.append(monitor)
         monitor.Start()