[android] Make build_type a singleton.

build/android/pylib/gtest/test_package_apk.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 TestPackageApk to help run APK-based native tests."""
 
 import logging
 import os
 import shlex
 import sys
 import tempfile
 import time
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import pexpect
 from pylib.android_commands import errors
 
 from test_package import TestPackage
 
 
 class TestPackageApk(TestPackage):
   """A helper class for running APK-based native tests."""
 
-  def __init__(self, suite_name, build_type):
+  def __init__(self, suite_name):
     """
     Args:
       suite_name: Name of the test suite (e.g. base_unittests).
-      build_type: 'Release' or 'Debug'.
     """
     TestPackage.__init__(self, suite_name)
-    product_dir = os.path.join(cmd_helper.OutDirectory.get(), build_type)
+    product_dir = os.path.join(cmd_helper.OutDirectory.get(),
+        constants.GetBuildType())
     if suite_name == 'content_browsertests':
       self.suite_path = os.path.join(
           product_dir, 'apks', '%s.apk' % suite_name)
       self._test_apk_package_name = constants.BROWSERTEST_TEST_PACKAGE_NAME
       self._test_activity_name = constants.BROWSERTEST_TEST_ACTIVITY_NAME
       self._command_line_file = constants.BROWSERTEST_COMMAND_LINE_FILE
     else:
       self.suite_path = os.path.join(
           product_dir, '%s_apk' % suite_name, '%s-debug.apk' % suite_name)
       self._test_apk_package_name = constants.GTEST_TEST_PACKAGE_NAME
@@ skipping 76 matching lines @@
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
     return self._WatchFifo(adb, timeout=10, logfile=logfile)
 
   #override
   def Install(self, adb):
     self.tool.CopyFiles()
     adb.ManagedInstall(self.suite_path, False,
                             package_name=self._test_apk_package_name)