Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3634)

Unified Diff: build/config/android/internal_rules.gni

Issue 2843053002: [Android] Don't add --tool=asan to junit wrapper scripts. (Closed)
Patch Set: Reverse asan & _device_test check order. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 8cc247bb59c17c64b87d34965a347bd890302573..3f592bde50d8defe23865700d345bd55cf176142 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -526,6 +526,7 @@ template("test_runner_script") {
]
}
+ _device_test = true
if (_test_type == "gtest") {
assert(defined(invoker.test_suite))
test_runner_args += [
@@ -570,6 +571,7 @@ template("test_runner_script") {
"--test-suite",
invoker.test_suite,
]
+ _device_test = false
} else if (_test_type == "linker") {
test_runner_args += [
"--test-apk",
@@ -609,7 +611,7 @@ template("test_runner_script") {
}
test_runner_args += [ "--fast-local-dev" ]
}
- if (is_asan) {
+ if (_device_test && is_asan) {
test_runner_args += [ "--tool=asan" ]
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698