Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this …

build/android/run_tests.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.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
    to be deployed to the device (in /data/local/tmp).
@@ skipping 149 matching lines @@
     log_dump_name: Name of log dump file.
     annotate: should we print buildbot-style annotations?
 
   Returns:
     A TestResults object.
   """
   results = []
 
   if test_suite:
     global _TEST_SUITES
-    if (not os.path.exists(test_suite) and
-        not os.path.splitext(test_suite)[1] == '.apk'):
+    if not os.path.exists(test_suite):
       logging.critical('Unrecognized test suite %s, supported: %s' %
                        (test_suite, _TEST_SUITES))
       if test_suite in _TEST_SUITES:
         logging.critical('(Remember to include the path: out/Release/%s)',
                          test_suite)
       return TestResults.FromOkAndFailed([], [BaseTestResult(test_suite, '')])
     fully_qualified_test_suites = [test_suite]
   else:
     fully_qualified_test_suites = FullyQualifiedTestSuites()
   debug_info_list = []
@@ skipping 241 matching lines @@
   if len(args) > 1:
     print 'Unknown argument:', args[1:]
     option_parser.print_usage()
     sys.exit(1)
   run_tests_helper.SetLogLevel(options.verbose_count)
   return Dispatch(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))