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

Unified Diff: testing/test.gni

Issue 1249723002: Revert "Preliminary support for Windows manifests in the GN build." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « remoting/remoting_host_win.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/test.gni
diff --git a/testing/test.gni b/testing/test.gni
index a224ef2918ec5179c94021c1372ffa7ff79f3169..c99df9036b6d8b636c5bb6912b67a4517475950e 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -203,20 +203,15 @@ template("test") {
defines = invoker.defines
}
+ # All shared libraries must have the sanitizer deps to properly link in
+ # asan mode (this target will be empty in other cases).
if (defined(invoker.deps)) {
- deps = invoker.deps
+ deps = invoker.deps + [ "//build/config/sanitizers:deps" ]
} else {
- deps = []
+ deps = [
+ "//build/config/sanitizers:deps",
+ ]
}
- deps += [
- # All shared libraries must have the sanitizer deps to properly link in
- # asan mode (this target will be empty in other cases).
- "//build/config/sanitizers:deps",
-
- # Give tests the default manifest on Windows (a no-op elsewhere).
- "//build/win:default_exe_manifest",
- ]
-
if (defined(invoker.direct_dependent_configs)) {
direct_dependent_configs = invoker.direct_dependent_configs
}
« no previous file with comments | « remoting/remoting_host_win.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698