[android] Make build_type a singleton.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index acee213847d93829e987b227238c3bd388f4e2d5..409409b664181733de09d6120cda1846122dfe09 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -91,6 +91,7 @@ def AddCommonOptions(option_parser):
 def ProcessCommonOptions(options):
   """Processes and handles all common options."""
   run_tests_helper.SetLogLevel(options.verbose_count)
+  constants.SetBuildType(options.build_type)
 
 
 def AddGTestOptions(option_parser):
@@ -271,7 +272,6 @@ def ProcessInstrumentationOptions(options, error_func):
         '%s.jar' %  options.test_apk)
 
   return instrumentation_test_options.InstrumentationOptions(
-      options.build_type,
       options.tool,
       options.cleanup_test_files,
       options.push_deps,
@@ -340,7 +340,6 @@ def ProcessUIAutomatorOptions(options, error_func):
       '_java.jar')
 
   return uiautomator_test_options.UIAutomatorOptions(
-      options.build_type,
       options.tool,
       options.cleanup_test_files,
       options.push_deps,
@@ -407,7 +406,6 @@ def ProcessMonkeyTestOptions(options, error_func):
     category = options.category.split(',')
 
   return monkey_test_options.MonkeyOptions(
-      options.build_type,
       options.verbose_count,
       options.package_name,
       options.activity_name,
@@ -427,7 +425,6 @@ def _RunGTests(options, error_func):
     # TODO(gkanwar): Move this into ProcessGTestOptions once we require -s for
     # the gtest command.
     gtest_options = gtest_test_options.GTestOptions(
-        options.build_type,
         options.tool,
         options.cleanup_test_files,
         options.push_deps,
@@ -440,7 +437,6 @@ def _RunGTests(options, error_func):
     results, test_exit_code = test_dispatcher.RunTests(
         tests, runner_factory, False, options.test_device,
         shard=True,
-        build_type=options.build_type,
         test_timeout=None,
         num_retries=options.num_retries)
 
@@ -451,7 +447,6 @@ def _RunGTests(options, error_func):
         results=results,
         test_type='Unit test',
         test_package=suite_name,
-        build_type=options.build_type,
         flakiness_server=options.flakiness_dashboard_server)
 
   if os.path.isdir(constants.ISOLATE_DEPS_DIR):
@@ -474,7 +469,6 @@ def _RunInstrumentationTests(options, error_func):
         tests, runner_factory, options.wait_for_debugger,
         options.test_device,
         shard=True,
-        build_type=options.build_type,
         test_timeout=None,
         num_retries=options.num_retries)
 
@@ -490,7 +484,6 @@ def _RunInstrumentationTests(options, error_func):
           tests, runner_factory, False,
           options.test_device,
           shard=True,
-          build_type=options.build_type,
           test_timeout=None,
           num_retries=options.num_retries)
 
@@ -505,7 +498,6 @@ def _RunInstrumentationTests(options, error_func):
       test_type='Instrumentation',
       test_package=os.path.basename(options.test_apk),
       annotation=options.annotations,
-      build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
 
   return exit_code
@@ -520,7 +512,6 @@ def _RunUIAutomatorTests(options, error_func):
   results, exit_code = test_dispatcher.RunTests(
       tests, runner_factory, False, options.test_device,
       shard=True,
-      build_type=options.build_type,
       test_timeout=None,
       num_retries=options.num_retries)
 
@@ -529,7 +520,6 @@ def _RunUIAutomatorTests(options, error_func):
       test_type='UIAutomator',
       test_package=os.path.basename(options.test_jar),
       annotation=options.annotations,
-      build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
 
   return exit_code
@@ -547,8 +537,7 @@ def _RunMonkeyTests(options, error_func):
   report_results.LogFull(
       results=results,
       test_type='Monkey',
-      test_package='Monkey',
-      build_type=options.build_type)
+      test_package='Monkey')
 
   return exit_code