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

build/android/single_test_runner.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.
 
 import logging
 import os
 import sys
 
 from base_test_runner import BaseTestRunner
 import debug_info
 import run_tests_helper
-from test_package_apk import TestPackageApk
 from test_package_executable import TestPackageExecutable
 from test_result import TestResults
 
 
 class SingleTestRunner(BaseTestRunner):
   """Single test suite attached to a single device.
 
   Args:
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
@@ skipping 17 matching lines @@
     self._gtest_filter = gtest_filter
     self._test_arguments = test_arguments
     self.test_results = TestResults()
     if dump_debug_info:
       self.dump_debug_info = debug_info.GTestDebugInfo(self.adb, device,
            os.path.basename(test_suite), gtest_filter)
     else:
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
 
-    if os.path.splitext(test_suite)[1] == '.apk':
-      self.test_package = TestPackageApk(self.adb, device,
-          test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
-          tool, self.dump_debug_info)
-    else:
-      android_product_out = '.' # os.environ['ANDROID_PRODUCT_OUT']
-      symbols_dir = os.path.join(android_product_out, 'symbols', 'data',
-                                 'local')
-      self.test_package = TestPackageExecutable(self.adb, device,
+    self.test_package = TestPackageExecutable(self.adb, device,
         test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
         tool, self.dump_debug_info)
 
   def _GetHttpServerDocumentRootForTestSuite(self):
     """Returns the document root needed by the test suite."""
     if self.test_package.test_suite_basename == 'page_cycler_tests':
       return os.path.join(run_tests_helper.CHROME_DIR, 'data', 'page_cycler')
     return None
 
 
@@ skipping 239 matching lines @@
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.test_package.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self.test_package.performance_test:
       self.adb.TearDownPerformanceTest()
     super(SingleTestRunner, self).TearDown()