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

Unified Diff: build/config/sanitizers/BUILD.gn

Issue 1582413008: GN(android) Fix build all with is_asan (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | third_party/android_protobuf/BUILD.gn » ('j') | third_party/android_protobuf/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/sanitizers/BUILD.gn
diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
index 193f19a60e8592f061feff3ad2d368faed39b881..439e3a699f98601fe60ce743e6a3599387a5ba28 100644
--- a/build/config/sanitizers/BUILD.gn
+++ b/build/config/sanitizers/BUILD.gn
@@ -10,7 +10,14 @@ import("//build/config/sanitizers/sanitizers.gni")
# |is_asan|, |is_lsan|, |is_tsan|, |is_msan| and |use_custom_libcxx| are false.
group("deps") {
if (using_sanitizer) {
- public_configs = [ ":sanitizer_options_link_helper" ]
+ public_configs = [
+ ":sanitizer_options_link_helper",
+
+ # Even when a target removes default_sanitizer_flags, it may be depending
+ # on a library that did not remove default_sanitizer_flags. Thus, we need
+ # to add the ldflags here as well as in default_sanitizer_flags.
+ ":default_sanitizer_ldflags",
brettw 2016/01/19 20:39:42 Doesn't this mean that if a target removes the def
agrieve 2016/02/02 19:22:31 That's correct, but I think it's desirable and how
brettw 2016/02/02 22:31:17 Okay, you convinced me.
+ ]
deps = [
":options_sources",
]
@@ -26,24 +33,6 @@ group("deps") {
config("sanitizer_options_link_helper") {
ldflags = [ "-Wl,-u_sanitizer_options_link_helper" ]
- if (is_asan) {
- ldflags += [ "-fsanitize=address" ]
- }
- if (is_lsan) {
- ldflags += [ "-fsanitize=leak" ]
- }
- if (is_tsan) {
- ldflags += [ "-fsanitize=thread" ]
- }
- if (is_msan) {
- ldflags += [ "-fsanitize=memory" ]
- }
- if (is_ubsan) {
- ldflags += [ "-fsanitize=undefined" ]
- }
- if (is_ubsan_vptr) {
- ldflags += [ "-fsanitize=vptr" ]
- }
}
source_set("options_sources") {
@@ -74,6 +63,29 @@ source_set("options_sources") {
}
}
+config("default_sanitizer_ldflags") {
+ if (is_posix) {
+ if (is_asan) {
+ ldflags = [ "-fsanitize=address" ]
+ }
+ if (is_lsan) {
+ ldflags = [ "-fsanitize=leak" ]
+ }
+ if (is_tsan) {
+ ldflags = [ "-fsanitize=thread" ]
+ }
+ if (is_msan) {
+ ldflags = [ "-fsanitize=memory" ]
+ }
+ if (is_ubsan) {
+ ldflags = [ "-fsanitize=undefined" ]
+ }
+ if (is_ubsan_vptr) {
+ ldflags = [ "-fsanitize=vptr" ]
+ }
+ }
+}
+
# This config is applied by default to all targets. It sets the compiler flags
# for sanitizer usage, or, if no sanitizer is set, does nothing.
#
@@ -84,6 +96,7 @@ config("default_sanitizer_flags") {
cflags_cc = []
ldflags = []
defines = []
+ configs = [ ":default_sanitizer_ldflags" ]
brettw 2016/01/19 20:39:43 This will cause these ldflags to get duplicated in
agrieve 2016/02/02 19:22:31 Didn't know that, and you obviously know about thi
brettw 2016/02/02 22:31:17 Oh actually this is fine. I misunderstood this and
# Only works on Posix-like platforms.
# FIXME: this is not true, remove the conditional.
« no previous file with comments | « no previous file | third_party/android_protobuf/BUILD.gn » ('j') | third_party/android_protobuf/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698