Change Android build configurations (step 2).

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 logging
 import os
 import pexpect
 import re
 import sys
 
 import android_commands
 from constants import CHROME_DIR
 
 class Forwarder(object):
   """Class to manage port forwards from the device to the host."""
 
   _FORWARDER_PATH = '/data/local/tmp/forwarder'
   _TIMEOUT_SECS = 30
 
-  def __init__(self, adb, port_pairs, tool, host_name):
+  def __init__(self, adb, port_pairs, tool, host_name, build_type):
     """Forwards TCP ports on the device back to the host.
 
     Works like adb forward, but in reverse.
 
     Args:
       adb: Instance of AndroidCommands for talking to the device.
       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.
       tool: Tool class to use to get wrapper, if necessary, for executing the
             forwarder (see valgrind_tools.py).
-      host_name: Optional. Address to forward to, must be addressable from the
-                 host machine. Usually this is omitted and loopback is used.
+      host_name: Address to forward to, must be addressable from the
+                 host machine. Usually use loopback '127.0.0.1'.
+      build_type: 'Release' or 'Debug'.
 
     Raises:
       Exception on failure to forward the port.
     """
     self._adb = adb
     self._host_to_device_port_map = dict()
     self._process = None
     adb.PushIfNeeded(
-        os.path.join(CHROME_DIR, 'out', 'Release', 'forwarder'),
+        os.path.join(CHROME_DIR, 'out', build_type, 'forwarder'),
         Forwarder._FORWARDER_PATH)
     forward_string = ['%d:%d:%s' %
                       (device, host, host_name) for device, host in port_pairs]
 
     # Kill off any existing forwarders on conflicting non-dynamically allocated
     # ports.
     for device_port, _ in port_pairs:
       if device_port != 0:
         self._KillForwardersUsingDevicePort(device_port)
 
@@ skipping 56 matching lines @@
 
   def DevicePortForHostPort(self, host_port):
     """Get the device port that corresponds to a given host port."""
     return self._host_to_device_port_map.get(host_port)
 
   def Close(self):
     """Terminate the forwarder process."""
     if self._process:
       self._process.close()
       self._process = None