Index: build/config/android/internal_rules.gni |
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
index e4e5b25f7e28fed2df50d0a5fb087a103ed95d90..06dbfb77fd5c92be5f239661674953dc0306c335 100644 |
--- a/build/config/android/internal_rules.gni |
+++ b/build/config/android/internal_rules.gni |
@@ -2070,32 +2070,22 @@ |
"//build/android:test_runner_py", |
] |
- test_runner_args = [ |
- _test_type, |
- "--output-directory", |
- rebase_path(root_build_dir, root_build_dir), |
- ] |
- |
# apk_target is not used for native executable tests |
# (e.g. breakpad_unittests). |
if (defined(invoker.apk_target)) { |
- assert(!defined(invoker.executable)) |
deps += [ "${invoker.apk_target}__build_config" ] |
_apk_build_config = |
get_label_info(invoker.apk_target, "target_gen_dir") + "/" + |
get_label_info(invoker.apk_target, "name") + ".build_config" |
_rebased_apk_build_config = rebase_path(_apk_build_config, root_build_dir) |
assert(_rebased_apk_build_config != "") # Mark as used. |
- } else if (_test_type == "gtest") { |
- assert( |
- defined(invoker.executable), |
- "Must define either apk_target or executable for test_runner_script()") |
- test_runner_args += [ |
- "--executable-path", |
- rebase_path(invoker.executable, root_build_dir), |
- ] |
- } |
- |
+ } |
+ |
+ test_runner_args = [ |
+ _test_type, |
+ "--output-directory", |
+ rebase_path(root_build_dir, root_build_dir), |
+ ] |
if (_test_type == "gtest") { |
assert(defined(invoker.test_suite)) |
test_runner_args += [ |