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

Side by Side Diff: mojo/tools/roll/sanitizers_build.patch

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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 unified diff | Download patch
OLDNEW
(Empty)
1 diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
2 index 8996951..023315f 100644
3 --- a/build/config/sanitizers/BUILD.gn
4 +++ b/build/config/sanitizers/BUILD.gn
5 @@ -8,9 +8,12 @@ import("//build/config/sanitizers/sanitizers.gni")
6 # shared_libraries. Unconditionally depend upon this target as it is empty if
7 # |is_asan|, |is_lsan|, |is_tsan|, |is_msan| and |use_custom_libcxx| are false.
8 group("deps") {
9 - deps = [
10 - "//third_party/instrumented_libraries:deps",
11 - ]
12 + # TODO(vtl): Chromium has the following (but we don't have
13 + # instrumented_libraries).
14 + # deps = [
15 + # "//third_party/instrumented_libraries:deps",
16 + # ]
17 + deps = []
18 if (is_asan || is_lsan || is_tsan || is_msan) {
19 public_configs = [ ":sanitizer_options_link_helper" ]
20 deps += [ ":options_sources" ]
21 diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sa nitizers.gni
22 index a7b9658..0edc144 100644
23 --- a/build/config/sanitizers/sanitizers.gni
24 +++ b/build/config/sanitizers/sanitizers.gni
25 @@ -6,7 +6,9 @@ declare_args() {
26 # Use libc++ (buildtools/third_party/libc++ and
27 # buildtools/third_party/libc++abi) instead of stdlibc++ as standard library.
28 # This is intended to be used for instrumented builds.
29 - use_custom_libcxx = (is_asan && is_linux) || is_tsan || is_msan
30 + # TODO(vtl): We don't use this, since building fails, for some reason.
31 + use_custom_libcxx = false
32 + # use_custom_libcxx = (is_asan && is_linux) || is_tsan || is_msan
33
34 # Track where uninitialized memory originates from. From fastest to slowest:
35 # 0 - no tracking, 1 - track only the initial allocation site, 2 - track the
OLDNEW
« no previous file with comments | « mojo/tools/roll/roll_network_service_patches/network_service.patch ('k') | mojo/tools/roll/update_from_chromium.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698