apk-based test runner work for android

build/android/single_test_runner.py

Index: build/android/single_test_runner.py
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py
index 4a3faa8cb28b07094f0a6764b04167dd04c51392..32900cefafc60bd3ae70f3368720c5b65c518f14 100644
--- a/build/android/single_test_runner.py
+++ b/build/android/single_test_runner.py
@@ -9,6 +9,7 @@ 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
 
@@ -46,9 +47,20 @@ class SingleTestRunner(BaseTestRunner):
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
 
-    self.test_package = TestPackageExecutable(self.adb, device,
-        test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
-        tool, self.dump_debug_info)
+    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')

[bulach, 2012/04/12 15:51:42]

56-59 seem unnecessary in this context..

[John Grabowski, 2012/04/13 01:11:37]

right; removed

+      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."""