Revert of 🍬 GN: Make breakpad_unittests & sandbox_linux_unittests use test()

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 re
 import tempfile
 
 from devil.android import apk_helper
@@ skipping 126 matching lines @@
 
   def __init__(self, args, isolate_delegate, error_func):
     super(GtestTestInstance, self).__init__()
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._extract_test_list_from_filter = args.extract_test_list_from_filter
     self._shard_timeout = args.shard_timeout
     self._skip_clear_data = args.skip_clear_data
     self._suite = args.suite_name[0]
-    self._exe_path = None
 
-    # GYP:
-    if args.executable_path:
-      self._exe_path = os.path.abspath(args.executable_path)
-    else:
-      # TODO(agrieve): Remove hardcoding after recipes are updated.
-      if self._suite == 'sandbox_linux_unittests':
-        exe_path = os.path.join(constants.GetOutDirectory(), 'obj', 'sandbox',
-                                'linux', 'sandbox_linux_unittests',
-                                'sandbox_linux_unittests')
-      elif self._suite == 'breakpad_unittests':
-        exe_path = os.path.join(constants.GetOutDirectory(), 'obj', 'breakpad',
-                                'breakpad_unittests', 'breakpad_unittests')
-      else:
-        exe_path = None
-
-      if exe_path and os.path.exists(exe_path):
-        self._exe_path = exe_path
-      else:
-        # GYP location:
-        exe_path = os.path.join(constants.GetOutDirectory(), self._suite)
-        if os.path.exists(exe_path):
-          self._exe_path = exe_path
+    self._exe_path = os.path.join(constants.GetOutDirectory(),
+                                  self._suite)
 
     incremental_part = ''
     if args.test_apk_incremental_install_script:
       incremental_part = '_incremental'
 
     apk_path = os.path.join(
         constants.GetOutDirectory(), '%s_apk' % self._suite,
         '%s-debug%s.apk' % (self._suite, incremental_part))
     self._test_apk_incremental_install_script = (
         args.test_apk_incremental_install_script)
     if not os.path.exists(apk_path):
       self._apk_helper = None
     else:
       self._apk_helper = apk_helper.ApkHelper(apk_path)
       self._extras = {
           _EXTRA_NATIVE_TEST_ACTIVITY: self._apk_helper.GetActivityName(),
       }
       if self._suite in RUN_IN_SUB_THREAD_TEST_SUITES:
         self._extras[_EXTRA_RUN_IN_SUB_THREAD] = 1
       if self._suite in BROWSER_TEST_SUITES:
         self._extras[_EXTRA_SHARD_SIZE_LIMIT] = 1
         self._extras[EXTRA_SHARD_NANO_TIMEOUT] = int(1e9 * self._shard_timeout)
         self._shard_timeout = 900
 
+    if not os.path.exists(self._exe_path):
+      self._exe_path = None
     if not self._apk_helper and not self._exe_path:
       error_func('Could not find apk or executable for %s' % self._suite)
 
     self._data_deps = []
     if args.test_filter:
       self._gtest_filter = args.test_filter
     elif args.test_filter_file:
       with open(args.test_filter_file, 'r') as f:
         self._gtest_filter = ':'.join(l.strip() for l in f)
     else:
@@ skipping 211 matching lines @@
         result_type = None
 
     return results
 
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     if self._isolate_delegate:
       self._isolate_delegate.Clear()