Change Android build configurations (step 2).

build/android/pylib/forwarder.py

Index: build/android/pylib/forwarder.py
diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py
index 15d4c46fece786ff3f945f391a364b118d0e77bd..34c3f1ee77424b57371fe60ed13b3175a96e2d3f 100644
--- a/build/android/pylib/forwarder.py
+++ b/build/android/pylib/forwarder.py
@@ -17,7 +17,7 @@ class Forwarder(object):
   _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.
@@ -31,8 +31,9 @@ class Forwarder(object):
                  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

[Satish, 2012/08/20 11:24:31]

is this not optional anymore?

[Xianzhu, 2012/08/20 17:54:58]

It has never been optional. It doesn't have a default value, and all call sites
specify the value.

-                 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.
@@ -41,7 +42,7 @@ class Forwarder(object):
     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]