[android] Upstream / sync most of build/android and build/android/pylib.

build/android/pylib/debug_info.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.
 
 """Collect debug info for a test."""
 
 import datetime
 import logging
 import os
 import re
@@ skipping 116 matching lines @@
     logging.info('Finish log dump.')
 
   def TakeScreenshot(self, identifier_mark):
     """Takes a screen shot from current specified device.
 
     Args:
       identifier_mark: A string to identify the screen shot DebugInfo will take.
                        It will be part of filename of the screen shot. Empty
                        string is acceptable.
     Returns:
-      Returns True if successfully taking screen shot from device, otherwise
-      returns False.
+      Returns the file name on the host of the screenshot if successful,
+      None otherwise.
     """
     self.InitStorage()
     assert isinstance(identifier_mark, str)
     shot_path = os.path.join(self.log_dir, ''.join([self._GeneratePrefixName(),
                                                     identifier_mark,
                                                     '_screenshot.png']))
     screenshot_path = os.path.join(os.getenv('ANDROID_HOST_OUT'), 'bin',
                                    'screenshot2')
     re_success = re.compile(re.escape('Success.'), re.MULTILINE)
     if re_success.findall(cmd_helper.GetCmdOutput([screenshot_path, '-s',
                                                    self.device, shot_path])):
       logging.info("Successfully took a screen shot to %s" % shot_path)
-      return True
+      return shot_path
     logging.error('Failed to take screen shot from device %s' % self.device)
-    return False
+    return None
 
   def ListCrashFiles(self):
     """Collects crash files from current specified device.
 
     Returns:
       A dict of crash files in format {"name": (size, lastmod), ...}.
     """
     if not self.collect_new_crashes:
       return {}
     return self.adb.ListPathContents(TOMBSTONE_DIR)
 
   def ArchiveNewCrashFiles(self):
     """Archives the crash files newly generated until calling this method."""
     if not self.collect_new_crashes:
       return
     current_crash_files = self.ListCrashFiles()
-    files = [f for f in current_crash_files if f not in self.old_crash_files]
-    logging.info('New crash file(s):%s' % ' '.join(files))
-    for f in files:
-      self.adb.Adb().Pull(TOMBSTONE_DIR + f,
-                          os.path.join(self.GetStoragePath(), f))
+    files = []
+    for f in current_crash_files:
+      if f not in self.old_crash_files:
+        files += [f]
+      elif current_crash_files[f] != self.old_crash_files[f]:
+        # Tomestones dir can only have maximum 10 files, so we need to compare
+        # size and timestamp information of file if the file exists.
+        files += [f]
+    if files:
+      logging.info('New crash file(s):%s' % ' '.join(files))
+      for f in files:
+        self.adb.Adb().Pull(TOMBSTONE_DIR + f,
+                            os.path.join(self.GetStoragePath(), f))
 
   @staticmethod
   def ZipAndCleanResults(dest_dir, dump_file_name, debug_info_list):
     """A helper method to zip all debug information results into a dump file.
 
     Args:
       dest-dir: Dir path in where we put the dump file.
       dump_file_name: Desired name of the dump file. This method makes sure
                       '.zip' will be added as ext name.
       debug_info_list: List of all debug info objects.
     """
     if not dest_dir or not dump_file_name or not debug_info_list:
       return
     cmd_helper.RunCmd(['mkdir', '-p', dest_dir])
     log_basename = os.path.basename(dump_file_name)
     log_file = os.path.join(dest_dir,
                             os.path.splitext(log_basename)[0] + '.zip')
     logging.info('Zipping debug dumps into %s ...' % log_file)
     for d in debug_info_list:
       d.ArchiveNewCrashFiles()
     # Add new dumps into the zip file. The zip may exist already if previous
     # gtest also dumps the debug information. It's OK since we clean up the old
     # dumps in each build step.
     cmd_helper.RunCmd(['zip', '-q', '-r', log_file,
                        ' '.join([d.GetStoragePath() for d in debug_info_list])])
     assert os.path.exists(log_file)
     for debug_info in debug_info_list:
       debug_info.CleanupStorage()