Android: removes hardcoded out directory in test_server.py

build/android/pylib/host_driven/test_server.py

 # Copyright 2013 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.
 
 """Host driven test server controller.
 
 This class controls the startup and shutdown of a python driven test server that
 runs in a separate process.
 
 The server starts up automatically when the object is created.
@@ skipping 52 matching lines @@
                         member variable |port|.
       test_server_path: The path (relative to the root src dir) of the server
     """
     self.host = _TEST_SERVER_HOST
     self.port = test_server_port + shard_index
 
     src_dir = constants.DIR_SOURCE_ROOT
     # Make dirs into a list of absolute paths.
     abs_dirs = [os.path.join(src_dir, d) for d in _PYTHONPATH_DIRS]
     # Add the generated python files to the path
-    abs_dirs.extend([os.path.join(src_dir, 'out', constants.GetBuildType(), d)
+    abs_dirs.extend([os.path.join(src_dir, constants.GetOutDirectory(), d)
                      for d in _GENERATED_PYTHONPATH_DIRS])
     current_python_path = os.environ.get('PYTHONPATH')
     extra_python_path = ':'.join(abs_dirs)
     if current_python_path:
       python_path = current_python_path + ':' + extra_python_path
     else:
       python_path = extra_python_path
 
     # NOTE: A separate python process is used to simplify getting the right
     # system path for finding includes.
     cmd = ['python', os.path.join(src_dir, test_server_path),
            '--log-to-console',
            ('--host=%s' % self.host),
            ('--port=%d' % self.port)]
     self._test_server_process = subprocess.Popen(
           cmd, env={'PYTHONPATH': python_path})
 
   def TearDown(self):
     self._test_server_process.kill()