Move AddBuildTypeOption to adb_install_apk.py and remove test_options_parser.py

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Utility script to install APKs from the command line quickly."""
 
 import multiprocessing
 import optparse
 import os
 import sys
 
 from pylib import android_commands
 from pylib import constants
 from pylib.device import device_utils
 from pylib.utils import apk_helper
-from pylib.utils import test_options_parser
+
+
+def AddBuildTypeOption(option_parser):
+  """Decorates OptionParser with build type option."""
+  default_build_type = 'Debug'

[bulach, 2014/05/19 10:19:22]

nit: 22-24 can be replaced with:

default_build_type = os.environ.get('BUILDTYPE', 'Debug')

[mlamouri (slow - plz ping), 2014/05/19 13:15:38]

Done. I actually moved the content to AddInstallAPKOption.

+  if 'BUILDTYPE' in os.environ:
+    default_build_type = os.environ['BUILDTYPE']
+  option_parser.add_option('--debug', action='store_const', const='Debug',
+                           dest='build_type', default=default_build_type,
+                           help='If set, run test suites under out/Debug. '
+                           'Default is env var BUILDTYPE or Debug')
+  option_parser.add_option('--release', action='store_const', const='Release',
+                           dest='build_type',
+                           help='If set, run test suites under out/Release. '
+                           'Default is env var BUILDTYPE or Debug.')
 
 
 def AddInstallAPKOption(option_parser):
   """Adds apk option used to install the APK to the OptionParser."""
-  test_options_parser.AddBuildTypeOption(option_parser)
+  AddBuildTypeOption(option_parser)
+
   option_parser.add_option('--apk',
                            help=('The name of the apk containing the '
                                  ' application (with the .apk extension).'))
   option_parser.add_option('--apk_package',
                            help=('The package name used by the apk containing '
                                  'the application.'))
   option_parser.add_option('--keep_data',
                            action='store_true',
                            default=False,
                            help=('Keep the package data when installing '
@@ skipping 35 matching lines @@
   pool = multiprocessing.Pool(len(devices))
   # Send a tuple (apk_path, apk_package, device) per device.
   pool.map(_InstallApk, zip([options.apk] * len(devices),
                             [options.apk_package] * len(devices),
                             [options.keep_data] * len(devices),
                             devices))
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))