Replace GetHostSize with a cross-platform implementation.

build/android/pylib/android_commands.py

 # 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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 983 matching lines @@
 
     # See if the file on the host changed since the last push (if any) and
     # return early if it didn't. Note that this shortcut assumes that the tests
     # on the device don't modify the files.
     if not os.path.isdir(host_path):
       if host_path in self._push_if_needed_cache:
         host_path_mtime = self._push_if_needed_cache[host_path]
         if host_path_mtime == os.stat(host_path).st_mtime:
           return
 
     def GetHostSize(path):

[craigdh, 2014/03/24 23:36:46]

This is getting really big for an inline function and it seems useful elsewhere,
can we stick this in pylib/utils/ with a unittest? Anything that breaks
PushIfNeeded tends to break things very subtly and painfully on the bots at some
later date.

-      return int(cmd_helper.GetCmdOutput(['du', '-sb', path]).split()[0])
+      running_size = os.path.getsize(path)
+      if os.path.isdir(path):
+        for root, dirs, files in os.walk(path):
+          running_size += sum([GetHostSize(os.path.join(root, f))

[craigdh, 2014/03/24 23:36:46]

You should just be able to call os.path.getsize on files, recursion isn't
necessary.

+                               for f in files])
+          running_size += sum([os.path.getsize(os.path.join(root, d))
+                               for d in dirs])
+      return running_size
 
     size = GetHostSize(host_path)
     self._pushed_files.append(device_path)
     self._potential_push_size += size
 
     changed_files = self.GetFilesChanged(host_path, device_path)
     logging.info('Found %d files that need to be pushed to %s',
         len(changed_files), device_path)
     if not changed_files:
       return
@@ skipping 827 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()