Add android buildbot support for exe tests

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 import collections
 import glob
 import json
 import multiprocessing
 import optparse
@@ skipping 116 matching lines @@
   Args:
     options: options object.
     suites: List of suites to run.
   """
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   for suite in suites:
-    buildbot_report.PrintNamedStep(suite)
-    RunCmd(['build/android/run_tests.py', '-s', suite] + args)
+    buildbot_report.PrintNamedStep(suite.name)
+    cmd = ['build/android/run_tests.py', '-s', suite.name] + args
+    if suite.is_suite_exe:
+      cmd.append('--exe')
+    RunCmd(cmd)
 
 def RunBrowserTestSuite(options):
   """Manages an invocation of run_browser_tests.py.
 
   Args:
     options: options object.
   """
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
@@ skipping 117 matching lines @@
     InstallApk(options, test_obj, print_step=True)
 
   if 'chromedriver' in options.test_filter:
     RunChromeDriverTests()
   if 'unit' in options.test_filter:
     RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
   if 'ui' in options.test_filter:
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
-    RunTestSuites(options, ['webkit_unit_tests', 'TestWebKitAPI'])
+    RunTestSuites(options, [
+        gtest_config.Apk('webkit_unit_tests'),
+        gtest_config.Apk('TestWebKitAPI'),
+    ])
     RunWebkitLint(options.target)
   if 'webkit_layout' in options.test_filter:
     RunWebkitLayoutTests(options)
 
   if options.experimental:
     RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
     RunBrowserTestSuite(options)
 
   # Print logcat, kill logcat monitor
   buildbot_report.PrintNamedStep('logcat_dump')
@@ skipping 60 matching lines @@
       'slave', 'android'))
   if os.path.exists(build_internal_android):
     android_paths.insert(0, build_internal_android)
   os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']])
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))