Change Android build configurations (step 3).

build/android/pylib/test_options_parser.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.
 
 """Parses options for the instrumentation tests."""
 
 import constants
 import optparse
 import os
 
 _SDK_OUT_DIR = os.path.join(constants.CHROME_DIR, 'out')
 
 
 def AddBuildTypeOption(option_parser):
-  # TODO(wangxianzhu): Change to Debug when we build Debug by default.
-  default_build_type = 'Release'
+  default_build_type = 'Debug'
   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.')
+                           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.')
+                           help='If set, run test suites under out/Release. '
+                                'Default is env var BUILDTYPE or Debug.')
 
 
 def CreateTestRunnerOptionParser(usage=None, default_timeout=60):
   """Returns a new OptionParser with arguments applicable to all tests."""
   option_parser = optparse.OptionParser(usage=usage)
   option_parser.add_option('-t', dest='timeout',
                            help='Timeout to wait for each test',
                            type='int',
                            default=default_timeout)
   option_parser.add_option('-c', dest='cleanup_test_files',
@@ skipping 88 matching lines @@
                                            '%s.jar'
                                            % options.test_apk)
   if options.annotation_str:
     options.annotation = options.annotation_str.split()
   elif options.test_filter:
     options.annotation = []
   else:
     options.annotation = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']
 
   return options