[android] Make build_type a singleton.

BUG=260494
TEST=None
NOTRY=True

Review URL: https://chromiumcodereview.appspot.com/22933005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217855 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 10 deletions

diff --git a/build/android/pylib/host_driven/setup.py b/build/android/pylib/host_driven/setup.py
index ae7860a..a087bf1 100644
--- a/build/android/pylib/host_driven/setup.py
+++ b/build/android/pylib/host_driven/setup.py
@@ -196,7 +196,6 @@ def InstrumentationSetup(host_driven_test_root, official_build,
     return test_runner.HostDrivenTestRunner(
         device, shard_index,
         instrumentation_options.tool,
-        instrumentation_options.build_type,
         instrumentation_options.push_deps,
         instrumentation_options.cleanup_test_files)
 
diff --git a/build/android/pylib/host_driven/test_case.py b/build/android/pylib/host_driven/test_case.py
index 2bf5f0a..4f70508 100644
--- a/build/android/pylib/host_driven/test_case.py
+++ b/build/android/pylib/host_driven/test_case.py
@@ -24,6 +24,7 @@ import os
 import time
 
 from pylib import android_commands
+from pylib import constants
 from pylib.base import base_test_result
 from pylib.instrumentation import test_package
 from pylib.instrumentation import test_result
@@ -55,11 +56,10 @@ class HostDrivenTestCase(object):
     self.instrumentation_options = instrumentation_options
     self.ports_to_forward = []
 
-  def SetUp(self, device, shard_index, build_type, push_deps,
+  def SetUp(self, device, shard_index, push_deps,
             cleanup_test_files):
     self.device_id = device
     self.shard_index = shard_index
-    self.build_type = build_type
     self.adb = android_commands.AndroidCommands(self.device_id)
     self.push_deps = push_deps
     self.cleanup_test_files = cleanup_test_files
@@ -69,7 +69,7 @@ class HostDrivenTestCase(object):
 
   def GetOutDir(self):
     return os.path.join(os.environ['CHROME_SRC'], 'out',
-                        self.build_type)
+                        constants.GetBuildType())
 
   def Run(self):
     logging.info('Running host-driven test: %s', self.tagged_name)
diff --git a/build/android/pylib/host_driven/test_runner.py b/build/android/pylib/host_driven/test_runner.py
index 9a9acdd..53fd70f 100644
--- a/build/android/pylib/host_driven/test_runner.py
+++ b/build/android/pylib/host_driven/test_runner.py
@@ -49,7 +49,7 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
   """
 
   #override
-  def __init__(self, device, shard_index, tool, build_type, push_deps,
+  def __init__(self, device, shard_index, tool, push_deps,
                cleanup_test_files):
     """Creates a new HostDrivenTestRunner.
 
@@ -57,13 +57,12 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
       device: Attached android device.
       shard_index: Shard index.
       tool: Name of the Valgrind tool.
-      build_type: 'Release' or 'Debug'.
       push_deps: If True, push all dependencies to the device.
       cleanup_test_files: Whether or not to cleanup test files on device.
     """
 
-    super(HostDrivenTestRunner, self).__init__(device, tool, build_type,
-                                               push_deps, cleanup_test_files)
+    super(HostDrivenTestRunner, self).__init__(device, tool, push_deps,
+                                               cleanup_test_files)
 
     # The shard index affords the ability to create unique port numbers (e.g.
     # DEFAULT_PORT + shard_index) if the test so wishes.
@@ -87,8 +86,8 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
     exception_raised = False
 
     try:
-      test.SetUp(self.device, self.shard_index, self.build_type,
-                 self._push_deps, self._cleanup_test_files)
+      test.SetUp(self.device, self.shard_index, self._push_deps,
+                 self._cleanup_test_files)
     except Exception:
       logging.exception(
           'Caught exception while trying to run SetUp() for test: ' +