commit 44e1385658538e5b4290cab45dae0ad4ccb0c3fa
author jbudorick <jbudorick@chromium.org> Wed Apr 26 22:54:26 2017
committer Commit bot <commit-bot@chromium.org> Wed Apr 26 22:54:26 2017
tree 0e425cb236a3b044aaae36299a8c3a1600a9ed82
parent e34a57e09e8588f0ce6dc87de2ce0b71f51de6e8

[Android] Don't add --tool=asan to junit wrapper scripts.

BUG=715304

Review-Url: https://codereview.chromium.org/2843053002
Cr-Original-Commit-Position: refs/heads/master@{#467494}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a4fc2b93398945ed1953483b6df3ccf433a216bf

android/internal_rules.gni

diff --git a/android/internal_rules.gni b/android/internal_rules.gni
index 8cc247b..3f592bd 100644
--- a/android/internal_rules.gni
+++ b/android/internal_rules.gni
@@ -526,6 +526,7 @@
       ]
     }
 
+    _device_test = true
     if (_test_type == "gtest") {
       assert(defined(invoker.test_suite))
       test_runner_args += [
@@ -570,6 +571,7 @@
         "--test-suite",
         invoker.test_suite,
       ]
+      _device_test = false
     } else if (_test_type == "linker") {
       test_runner_args += [
         "--test-apk",
@@ -609,7 +611,7 @@
       }
       test_runner_args += [ "--fast-local-dev" ]
     }
-    if (is_asan) {
+    if (_device_test && is_asan) {
       test_runner_args += [ "--tool=asan" ]
     }