[android] Explicitly specify whether to ignore file paths when pushing files.

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.
 """
 
 import collections
@@ skipping 407 matching lines @@
       apk_path: Path to .apk file to install.
       keep_data: Reinstalls instead of uninstalling first, preserving the
         application data.
       package_name: Package name (only needed if keep_data=False).
       reboots_on_failure: number of time to reboot if package manager is frozen.
     """
     # Check if package is already installed and up to date.
     if package_name:
       installed_apk_path = self.GetApplicationPath(package_name)
       if (installed_apk_path and
-          not self.GetFilesChanged(apk_path, installed_apk_path)):
+          not self.GetFilesChanged(apk_path, installed_apk_path,
+                                   ignore_filenames=True)):
         logging.info('Skipped install: identical %s APK already installed' %
             package_name)
         return
     # Install.
     reboots_left = reboots_on_failure
     while True:
       try:
         if not keep_data:
           assert package_name
           self.Uninstall(package_name)
@@ skipping 359 matching lines @@
     cmd = (MD5SUM_LD_LIBRARY_PATH + ' ' + self._util_wrapper + ' ' +
            MD5SUM_DEVICE_PATH + ' ' + device_path)
     device_hash_tuples = _ParseMd5SumOutput(
         self.RunShellCommand(cmd, timeout_time=2 * 60))
     assert os.path.exists(host_path), 'Local path not found %s' % host_path
     md5sum_output = cmd_helper.GetCmdOutput(
         ['%s/md5sum_bin_host' % self._md5sum_build_dir, host_path])
     host_hash_tuples = _ParseMd5SumOutput(md5sum_output.splitlines())
     return (host_hash_tuples, device_hash_tuples)
 
-  def GetFilesChanged(self, host_path, device_path):
+  def GetFilesChanged(self, host_path, device_path, ignore_filenames=False):

[frankf, 2013/09/04 21:52:21]

This needs to be cleaned up and move to its own utility module. As it stands,
it's pretty much unreadable.

     """Compares the md5sum of a host path against a device path.
 
     Note: Ignores extra files on the device.
 
     Args:
       host_path: Path (file or directory) on the host.
       device_path: Path on the device.
+      ignore_filenames: If True only the file contents are considered when
+          checking whether a file has changed, otherwise the relative path
+          must also match.
 
     Returns:
       A list of tuples of the form (host_path, device_path) for files whose
       md5sums do not match.
     """
     host_hash_tuples, device_hash_tuples = self._RunMd5Sum(
         host_path, device_path)
 
     # Ignore extra files on the device.
-    if len(device_hash_tuples) > len(host_hash_tuples):
+    if not ignore_filenames:
       host_files = [os.path.relpath(os.path.normpath(p.path),
                     os.path.normpath(host_path)) for p in host_hash_tuples]
 
       def HostHas(fname):
         return any(path in fname for path in host_files)
 
       device_hash_tuples = [h for h in device_hash_tuples if HostHas(h.path)]
 
     # Constructs the target device path from a given host path. Don't use when
     # only a single file is given as the base name given in device_path may
@@ skipping 712 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()