Revert 221736 "[android] Adds constants.GetOutDirectory() and co..."

trunk/src/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.
 
 import fcntl
 import logging
 import os
 import psutil
 import re
 import sys
 import time
 
 import android_commands
 import cmd_helper
 import constants
 
 from pylib import valgrind_tools
 
 
+def _MakeBinaryPath(build_type, binary_name):
+  return os.path.join(cmd_helper.OutDirectory.get(), build_type, binary_name)
+
+
 def _GetProcessStartTime(pid):
   return psutil.Process(pid).create_time
 
 
 class _FileLock(object):
   """With statement-aware implementation of a file lock.
 
   File locks are needed for cross-process synchronization when the
   multiprocessing Python module is used.
   """
@@ skipping 23 matching lines @@
   _MULTIPROCESSING_ENV_VAR = 'CHROME_FORWARDER_USE_MULTIPROCESSING'
 
   _instance = None
 
   @staticmethod
   def UseMultiprocessing():
     """Tells the forwarder that multiprocessing is used."""
     os.environ[Forwarder._MULTIPROCESSING_ENV_VAR] = '1'
 
   @staticmethod
-  def Map(port_pairs, adb, tool=None):
+  def Map(port_pairs, adb, build_type='Debug', tool=None):
     """Runs the forwarder.
 
     Args:
       port_pairs: A list of tuples (device_port, host_port) to forward. Note
                  that you can specify 0 as a device_port, in which case a
                  port will by dynamically assigned on the device. You can
                  get the number of the assigned port using the
                  DevicePortForHostPort method.
       adb: An AndroidCommands instance.
       tool: Tool class to use to get wrapper, if necessary, for executing the
             forwarder (see valgrind_tools.py).
 
     Raises:
       Exception on failure to forward the port.
     """
     if not tool:
       tool = valgrind_tools.CreateTool(None, adb)
     with _FileLock(Forwarder._LOCK_PATH):
-      instance = Forwarder._GetInstanceLocked(tool)
+      instance = Forwarder._GetInstanceLocked(build_type, tool)
       instance._InitDeviceLocked(adb, tool)
 
       device_serial = adb.Adb().GetSerialNumber()
       redirection_commands = [
           ['--serial-id=' + device_serial, '--map', str(device),
            str(host)] for device, host in port_pairs]
       logging.info('Forwarding using commands: %s', redirection_commands)
 
       for redirection_command in redirection_commands:
         try:
@@ skipping 33 matching lines @@
   @staticmethod
   def UnmapAllDevicePorts(adb):
     """Unmaps all the previously forwarded ports for the provided device.
 
     Args:
       adb: An AndroidCommands instance.
       port_pairs: A list of tuples (device_port, host_port) to unmap.
     """
     with _FileLock(Forwarder._LOCK_PATH):
       port_map = Forwarder._GetInstanceLocked(
-          None)._device_to_host_port_map
+          None, None)._device_to_host_port_map
       adb_serial = adb.Adb().GetSerialNumber()
       for (device_serial, device_port) in port_map.keys():
         if adb_serial == device_serial:
           Forwarder._UnmapDevicePortLocked(device_port, adb)
 
   @staticmethod
   def DevicePortForHostPort(host_port):
     """Returns the device port that corresponds to a given host port."""
     with _FileLock(Forwarder._LOCK_PATH):
       (device_serial, device_port) = Forwarder._GetInstanceLocked(
-          None)._host_to_device_port_map.get(host_port)
+          None, None)._host_to_device_port_map.get(host_port)
       return device_port
 
   @staticmethod
-  def _GetInstanceLocked(tool):
+  def _GetInstanceLocked(build_type, tool):
     """Returns the singleton instance.
 
     Note that the global lock must be acquired before calling this method.
 
     Args:
+      build_type: 'Release' or 'Debug'
       tool: Tool class to use to get wrapper, if necessary, for executing the
             forwarder (see valgrind_tools.py).
     """
     if not Forwarder._instance:
-      Forwarder._instance = Forwarder(tool)
+      Forwarder._instance = Forwarder(build_type, tool)
     return Forwarder._instance
 
-  def __init__(self, tool):
+  def __init__(self, build_type, tool):
     """Constructs a new instance of Forwarder.
 
     Note that Forwarder is a singleton therefore this constructor should be
     called only once.
 
     Args:
+      build_type: 'Release' or 'Debug'
       tool: Tool class to use to get wrapper, if necessary, for executing the
             forwarder (see valgrind_tools.py).
     """
     assert not Forwarder._instance
+    self._build_type = build_type
     self._tool = tool
     self._initialized_devices = set()
     self._device_to_host_port_map = dict()
     self._host_to_device_port_map = dict()
-    self._host_forwarder_path = os.path.join(
-        constants.GetOutDirectory(), 'host_forwarder')
-    assert os.path.exists(self._host_forwarder_path), 'Please build forwarder2'
+    self._host_forwarder_path = _MakeBinaryPath(
+        self._build_type, 'host_forwarder')
+    if not os.path.exists(self._host_forwarder_path):
+      self._build_type = 'Release' if self._build_type == 'Debug' else 'Debug'
+      self._host_forwarder_path = _MakeBinaryPath(
+          self._build_type, 'host_forwarder')
+      assert os.path.exists(
+          self._host_forwarder_path), 'Please build forwarder2'
     self._device_forwarder_path_on_host = os.path.join(
-        constants.GetOutDirectory(), 'forwarder_dist')
+        cmd_helper.OutDirectory.get(), self._build_type, 'forwarder_dist')
     self._InitHostLocked()
 
   @staticmethod
   def _UnmapDevicePortLocked(device_port, adb):
     """Internal method used by UnmapDevicePort().
 
     Note that the global lock must be acquired before calling this method.
     """
-    instance = Forwarder._GetInstanceLocked(None)
+    instance = Forwarder._GetInstanceLocked(None, None)
     serial = adb.Adb().GetSerialNumber()
     serial_with_port = (serial, device_port)
     if not serial_with_port in instance._device_to_host_port_map:
       logging.error('Trying to unmap non-forwarded port %d' % device_port)
       return
     redirection_command = ['--serial-id=' + serial, '--unmap', str(device_port)]
     (exit_code, output) = cmd_helper.GetCmdStatusAndOutput(
         [instance._host_forwarder_path] + redirection_command)
     if exit_code != 0:
       logging.error('%s exited with %d:\n%s' % (
@@ skipping 98 matching lines @@
                                  Forwarder._DEVICE_FORWARDER_PATH))
     # 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 = adb.KillAllBlocking('device_forwarder', timeout_sec)
     if not processes_killed:
       pids = adb.ExtractPid('device_forwarder')
       if pids:
         raise Exception('Timed out while killing device_forwarder')