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

trunk/src/build/android/pylib/gtest/test_package_exe.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.
 
 """Defines TestPackageExecutable to help run stand-alone executables."""
 
 import logging
 import os
 import shutil
 import sys
@@ skipping 10 matching lines @@
   """A helper class for running stand-alone executables."""
 
   _TEST_RUNNER_RET_VAL_FILE = 'gtest_retval'
 
   def __init__(self, suite_name):
     """
     Args:
       suite_name: Name of the test suite (e.g. base_unittests).
     """
     TestPackage.__init__(self, suite_name)
-    self.suite_path = os.path.join(constants.GetOutDirectory(), suite_name)
-    self._symbols_dir = os.path.join(constants.GetOutDirectory(),
-                                     'lib.target')
+    product_dir = os.path.join(cmd_helper.OutDirectory.get(),
+        constants.GetBuildType())
+    self.suite_path = os.path.join(product_dir, suite_name)
+    self._symbols_dir = os.path.join(product_dir, 'lib.target')
 
   #override
   def GetGTestReturnCode(self, adb):
     ret = None
     ret_code = 1  # Assume failure if we can't find it
     ret_code_file = tempfile.NamedTemporaryFile()
     try:
       if not adb.Adb().Pull(
           constants.TEST_EXECUTABLE_DIR + '/' +
           TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE,
@@ skipping 94 matching lines @@
                      'new one (%s).' % target_name)
         # Whenever we generate a stripped binary, copy to the symbols dir. If we
         # aren't stripping a new binary, assume it's there.
         if not os.path.exists(self._symbols_dir):
           os.makedirs(self._symbols_dir)
         shutil.copy(self.suite_path, self._symbols_dir)
         strip = os.environ['STRIP']
         cmd_helper.RunCmd([strip, self.suite_path, '-o', target_name])
     test_binary = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name
     adb.PushIfNeeded(target_name, test_binary)