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

build/android/pylib/test_package_executable.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.
 
 
 import logging
 import os
 import pexpect
 import shutil
 import sys
@@ skipping 62 matching lines @@
       logging.info('NATIVE_COVERAGE_DEPTH_STRIP is not defined: '
                    'No native coverage.')
       return ''
     export_string = 'export GCOV_PREFIX="/data/local/tmp/gcov"\n'
     export_string += 'export GCOV_PREFIX_STRIP=%s\n' % depth
     return export_string
 
   def GetAllTests(self):
     """Returns a list of all tests available in the test suite."""
     all_tests = self.adb.RunShellCommand(
-        '/data/local/tmp/%s --gtest_list_tests' % self.test_suite_basename)
+        '%s /data/local/tmp/%s --gtest_list_tests' %
+        (self.tool.GetTestWrapper(), self.test_suite_basename))
     return self._ParseGTestListTests(all_tests)
 
   def CreateTestRunnerScript(self, gtest_filter, test_arguments):
     """Creates a test runner script and pushes to the device.
 
     Args:
       gtest_filter: A gtest_filter flag.
       test_arguments: Additional arguments to pass to the test binary.
     """
     tool_wrapper = self.tool.GetTestWrapper()
@@ skipping 54 matching lines @@
             os.makedirs(self.symbols_dir)
           shutil.copy(self.test_suite, self.symbols_dir)
         strip = os.environ['STRIP']
         cmd_helper.RunCmd([strip, self.test_suite, '-o', target_name])
     test_binary = '/data/local/tmp/' + self.test_suite_basename
     self.adb.PushIfNeeded(target_name, test_binary)
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     return os.path.basename(self.test_suite)