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

Unified Diff: sandbox/linux/BUILD.gn

Issue 2152153002: Fix rpath dependencies in ASAN builds of chrome_sandbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/BUILD.gn
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
index 76eef666ac1673f7e1eaba174334774aa8829112..3070b7347bcc115bb1fc145d2162d9db366a6618 100644
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -306,7 +306,7 @@ if (is_linux) {
import("//build/config/compiler/compiler.gni")
import("//build/config/sanitizers/sanitizers.gni")
- if (is_component_build && !using_sanitizer) {
+ if (is_component_build || using_sanitizer) {
# WARNING! We remove this config so that we don't accidentally
# pick up the //build/config:rpath_for_built_shared_libraries
# sub-config. However, this means that we need to duplicate any
@@ -317,9 +317,11 @@ if (is_linux) {
}
}
- deps = [
- "//build/config/sanitizers:deps",
- ]
+ # We also do not want to pick up any of the other sanitizer
+ # flags (i.e. we do not want to build w/ the sanitizers at all).
+ # This is safe to delete unconditionally, because it is part of the
+ # default configs and empty when not using the sanitizers.
+ configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ]
}
}
« 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