[Android] Build android tools as PIE and add a wrapper for ICS

build/android/pylib/forwarder.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.
 
 # pylint: disable=W0212
 
 import fcntl
 import logging
 import os
 import psutil
@@ skipping 32 matching lines @@
     os.close(self._fd)
 
 
 class Forwarder(object):
   """Thread-safe class to manage port forwards from the device to the host."""
 
   _DEVICE_FORWARDER_FOLDER = (constants.TEST_EXECUTABLE_DIR +
                               '/forwarder/')
   _DEVICE_FORWARDER_PATH = (constants.TEST_EXECUTABLE_DIR +
                             '/forwarder/device_forwarder')
-  _LD_LIBRARY_PATH = 'LD_LIBRARY_PATH=%s' % _DEVICE_FORWARDER_FOLDER
   _LOCK_PATH = '/tmp/chrome.forwarder.lock'
   _MULTIPROCESSING_ENV_VAR = 'CHROME_FORWARDER_USE_MULTIPROCESSING'
   # Defined in host_forwarder_main.cc
   _HOST_FORWARDER_LOG = '/tmp/host_forwarder_log'
 
   _instance = None
 
   @staticmethod
   def UseMultiprocessing():
     """Tells the forwarder that multiprocessing is used."""
@@ skipping 222 matching lines @@
       tool: Tool class to use to get wrapper, if necessary, for executing the
             forwarder (see valgrind_tools.py).
     """
     device_serial = device.old_interface.Adb().GetSerialNumber()
     if device_serial in self._initialized_devices:
       return
     Forwarder._KillDeviceLocked(device, tool)
     device.old_interface.PushIfNeeded(
         self._device_forwarder_path_on_host,
         Forwarder._DEVICE_FORWARDER_FOLDER)
-    (exit_code, output) = device.old_interface.GetShellCommandStatusAndOutput(
-        '%s %s %s' % (Forwarder._LD_LIBRARY_PATH, tool.GetUtilWrapper(),
-                      Forwarder._DEVICE_FORWARDER_PATH))
+    cmd = '%s %s' % (tool.GetUtilWrapper(), Forwarder._DEVICE_FORWARDER_PATH)
+    (exit_code, output) = device.old_interface.GetAndroidToolStatusAndOutput(
+        cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)
     if exit_code != 0:
       raise Exception(
           'Failed to start device forwarder:\n%s' % '\n'.join(output))
     self._initialized_devices.add(device_serial)
 
   def _KillHostLocked(self):
     """Kills the forwarder process running on the host.
 
     Note that the global lock must be acquired before calling this method.
     """
@@ skipping 15 matching lines @@
 
     Args:
       device: Instance of DeviceUtils for talking to the device.
       tool: Wrapper tool (e.g. valgrind) that can be used to execute the device
             forwarder (see valgrind_tools.py).
     """
     logging.info('Killing device_forwarder.')
     if not device.old_interface.FileExistsOnDevice(
         Forwarder._DEVICE_FORWARDER_PATH):
       return
-    device.old_interface.GetShellCommandStatusAndOutput(
-        '%s %s --kill-server' % (tool.GetUtilWrapper(),
-                                 Forwarder._DEVICE_FORWARDER_PATH))
+
+    cmd = '%s %s --kill-server' % (tool.GetUtilWrapper(),
+                                   Forwarder._DEVICE_FORWARDER_PATH)
+    device.old_interface.GetAndroidToolStatusAndOutput(
+        cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)
+
     # TODO(pliard): Remove the following call to KillAllBlocking() when we are
     # sure that the old version of device_forwarder (not supporting
     # 'kill-server') is not running on the bots anymore.
     timeout_sec = 5
     processes_killed = device.old_interface.KillAllBlocking(
         'device_forwarder', timeout_sec)
     if not processes_killed:
       pids = device.old_interface.ExtractPid('device_forwarder')
       if pids:
         raise Exception('Timed out while killing device_forwarder')