diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/third_party/instrumented_libraries | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/instrumented_libraries')
-rw-r--r-- | chromium/third_party/instrumented_libraries/BUILD.gn | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/chromium/third_party/instrumented_libraries/BUILD.gn b/chromium/third_party/instrumented_libraries/BUILD.gn index c00813ccc92..aa0965ddaf3 100644 --- a/chromium/third_party/instrumented_libraries/BUILD.gn +++ b/chromium/third_party/instrumented_libraries/BUILD.gn @@ -12,19 +12,13 @@ declare_args() { group("deps") { if (use_locally_built_instrumented_libraries) { - deps = [ - ":locally_built", - ] + deps = [ ":locally_built" ] } else if (use_prebuilt_instrumented_libraries) { assert(prebuilt_instrumented_libraries_available, "Prebuilt instrumented libraries are only available when " + "is_msan = true and msan_track_origins = {0, 2}") - deps = [ - ":prebuilt", - ] - data_deps = [ - ":prebuilt", - ] + deps = [ ":prebuilt" ] + data_deps = [ ":prebuilt" ] } } @@ -40,12 +34,8 @@ if (prebuilt_instrumented_libraries_available) { group("prebuilt") { visibility = [ ":deps" ] - deps = [ - ":extract_prebuilt_instrumented_libraries", - ] - data_deps = [ - ":extract_prebuilt_instrumented_libraries", - ] + deps = [ ":extract_prebuilt_instrumented_libraries" ] + data_deps = [ ":extract_prebuilt_instrumented_libraries" ] } if (is_msan) { @@ -68,12 +58,8 @@ if (prebuilt_instrumented_libraries_available) { root_build_dir), rebase_path(target_out_dir, root_out_dir), ] - outputs = [ - "$target_out_dir/$archive_prefix.txt", - ] - data = [ - "$root_out_dir/instrumented_libraries_prebuilt/", - ] + outputs = [ "$target_out_dir/$archive_prefix.txt" ] + data = [ "$root_out_dir/instrumented_libraries_prebuilt/" ] } config("prebuilt_ldflags") { @@ -168,9 +154,7 @@ if (use_locally_built_instrumented_libraries) { if (!is_tsan) { deps += [ ":libpng12-0" ] } - data = [ - "${root_out_dir}/instrumented_libraries/${sanitizer_type}/lib", - ] + data = [ "${root_out_dir}/instrumented_libraries/${sanitizer_type}/lib" ] } config("locally_built_ldflags") { @@ -244,9 +228,7 @@ if (use_locally_built_instrumented_libraries) { "--ldflags=${package_ldflags}", "--sanitizer=${sanitizer_type}", ] - outputs = [ - "${root_out_dir}/instrumented_libraries/${sanitizer_type}/${target_name}.txt", - ] + outputs = [ "${root_out_dir}/instrumented_libraries/${sanitizer_type}/${target_name}.txt" ] inputs = [] if (defined(invoker.pre_build)) { inputs += [ invoker.pre_build ] @@ -837,9 +819,7 @@ if (use_locally_built_instrumented_libraries) { instrumented_library("nss") { # TODO(eugenis): get rid of this dependency - deps = [ - ":libnspr4", - ] + deps = [ ":libnspr4" ] patch = "patches/nss.diff" build_method = "custom_nss" } |