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

trunk/src/build/android/pylib/gtest/setup.py

Index: trunk/src/build/android/pylib/gtest/setup.py
===================================================================
--- trunk/src/build/android/pylib/gtest/setup.py	(revision 222006)
+++ trunk/src/build/android/pylib/gtest/setup.py	(working copy)
@@ -96,6 +96,10 @@
   Args:
     suite_name: Name of the test suite (e.g. base_unittests).
   """
+  product_dir = os.path.join(cmd_helper.OutDirectory.get(),
+      constants.GetBuildType())
+  assert os.path.isabs(product_dir)
+
   if os.path.isdir(constants.ISOLATE_DEPS_DIR):
     shutil.rmtree(constants.ISOLATE_DEPS_DIR)
 
@@ -106,14 +110,14 @@
 
   isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT, isolate_rel_path)
   isolated_abs_path = os.path.join(
-      constants.GetOutDirectory(), '%s.isolated' % suite_name)
+      product_dir, '%s.isolated' % suite_name)
   assert os.path.exists(isolate_abs_path)
   isolate_cmd = [
       'python', _ISOLATE_SCRIPT,
       'remap',
       '--isolate', isolate_abs_path,
       '--isolated', isolated_abs_path,
-      '-V', 'PRODUCT_DIR=%s' % constants.GetOutDirectory(),
+      '-V', 'PRODUCT_DIR=%s' % product_dir,
       '-V', 'OS=android',
       '--outdir', constants.ISOLATE_DEPS_DIR,
   ]