Make base_unittests_apk actually work

build/android/pylib/gtest/setup.py

 # Copyright 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.
 
 """Generates test runner factory and tests for GTests."""
 # pylint: disable=W0212
 
 import fnmatch
 import glob
 import logging
@@ skipping 276 matching lines @@
 
   Args:
     test_options: A GTestOptions object.
     devices: A list of attached devices.
 
   Returns:
     A tuple of (TestRunnerFactory, tests).
   """
   test_package = test_package_apk.TestPackageApk(test_options.suite_name)
   if not os.path.exists(test_package.suite_path):
-    test_package = test_package_exe.TestPackageExecutable(
+    exe_test_package = test_package_exe.TestPackageExecutable(
         test_options.suite_name)
-    if not os.path.exists(test_package.suite_path):
+    if not os.path.exists(exe_test_package.suite_path):
       raise Exception(
-          'Did not find %s target. Ensure it has been built.'
-          % test_options.suite_name)
+          'Did not find %s target. Ensure it has been built.\n'
+          '(not found at %s or %s)'
+          % (test_options.suite_name,
+             test_package.suite_path,
+             exe_test_package.suite_path))
+    test_package = exe_test_package
   logging.warning('Found target %s', test_package.suite_path)
 
   _GenerateDepsDirUsingIsolate(test_options.suite_name,
                                test_options.isolate_file_path)
 
   tests = _GetTests(test_options, test_package, devices)
 
   # Constructs a new TestRunner with the current options.
   def TestRunnerFactory(device, _shard_index):
     return test_runner.TestRunner(
@@ skipping 11 matching lines @@
   if test_options.gtest_filter:
     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
 
   # Coalesce unit tests into a single test per device
   if test_options.suite_name != 'content_browsertests':
     num_devices = len(devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)