| Index: third_party/instrumented_libraries/BUILD.gn
|
| diff --git a/third_party/instrumented_libraries/BUILD.gn b/third_party/instrumented_libraries/BUILD.gn
|
| index 8ca522c2bcfdc0d8c578519074bdf49a4fca3772..de05fe7d6b0dd4a8648261c7922a49bedff20a90 100644
|
| --- a/third_party/instrumented_libraries/BUILD.gn
|
| +++ b/third_party/instrumented_libraries/BUILD.gn
|
| @@ -4,9 +4,6 @@
|
|
|
| import("//build/config/sanitizers/sanitizers.gni")
|
|
|
| -prebuilt_available =
|
| - is_msan && (msan_track_origins == 0 || msan_track_origins == 2)
|
| -
|
| group("deps") {
|
| if (use_prebuilt_instrumented_libraries) {
|
| assert(prebuilt_available,
|
| @@ -15,16 +12,22 @@ group("deps") {
|
| deps = [
|
| ":prebuilt",
|
| ]
|
| + data_deps = [
|
| + ":prebuilt",
|
| + ]
|
| }
|
| }
|
|
|
| -if (prebuilt_available) {
|
| +if (prebuilt_instrumented_libraries_available) {
|
| group("prebuilt") {
|
| visibility = [ ":deps" ]
|
| - all_dependent_configs = [ ":prebuilt_link_helper" ]
|
| +
|
| deps = [
|
| ":extract_prebuilt_instrumented_libraries",
|
| ]
|
| + data_deps = [
|
| + ":extract_prebuilt_instrumented_libraries",
|
| + ]
|
| }
|
|
|
| if (is_msan) {
|
| @@ -52,10 +55,12 @@ if (prebuilt_available) {
|
| outputs = [
|
| "$target_out_dir/$archive_prefix.txt",
|
| ]
|
| + data = [
|
| + "$root_out_dir/instrumented_libraries_prebuilt/",
|
| + ]
|
| }
|
|
|
| - config("prebuilt_link_helper") {
|
| - visibility = [ ":prebuilt" ]
|
| + config("prebuilt_ldflags") {
|
| ldflags = [
|
| # Add a relative RPATH entry to Chromium binaries. This puts instrumented
|
| # DSOs before system-installed versions in library search path.
|
|
|