[Android] Reland of 'Add zip pushing and refine push mode selection.'

build/android/pylib/valgrind_tools.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.
 
 """
 Classes in this file define additional actions that need to be taken to run a
 test under some kind of runtime error detection tool.
 
 The interface is intended to be used as follows.
 
@@ skipping 154 matching lines @@
                              'wrap.org.chromium.native_test']
 
   def CopyFiles(self):
     """Copies Valgrind tools to the device."""
     self._device.RunShellCommand(
         'rm -r %s; mkdir %s' % (ValgrindTool.VG_DIR, ValgrindTool.VG_DIR))
     self._device.RunShellCommand(
         'rm -r %s; mkdir %s' % (ValgrindTool.VGLOGS_DIR,
                                 ValgrindTool.VGLOGS_DIR))
     files = self.GetFilesForTool()
-    for f in files:
-      self._device.PushChangedFiles(
-          os.path.join(DIR_SOURCE_ROOT, f),
+    self._device.PushChangedFiles(
+        [((os.path.join(DIR_SOURCE_ROOT, f),
           os.path.join(ValgrindTool.VG_DIR, os.path.basename(f)))
+         for f in files)])
 
   def SetupEnvironment(self):
     """Sets up device environment."""
     self._device.RunShellCommand('chmod 777 /data/local/tmp')
     self._device.RunShellCommand('setenforce 0')
     for prop in self._wrap_properties:
       self._device.RunShellCommand(
           'setprop %s "logwrapper %s"' % (prop, self.GetTestWrapper()))
     SetChromeTimeoutScale(self._device, self.GetTimeoutScale())
 
@@ skipping 80 matching lines @@
   if not tool_name:
     return BaseTool()
 
   ctor = TOOL_REGISTRY.get(tool_name)
   if ctor:
     return ctor(device)
   else:
     print 'Unknown tool %s, available tools: %s' % (
         tool_name, ', '.join(sorted(TOOL_REGISTRY.keys())))
     sys.exit(1)