| 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..edb45504cac9707e3a4368a37970ba79745d5dc7 100644
 | 
| --- a/third_party/instrumented_libraries/BUILD.gn
 | 
| +++ b/third_party/instrumented_libraries/BUILD.gn
 | 
| @@ -15,16 +15,22 @@ group("deps") {
 | 
|      deps = [
 | 
|        ":prebuilt",
 | 
|      ]
 | 
| +    data_deps = [
 | 
| +      ":prebuilt",
 | 
| +    ]
 | 
|    }
 | 
|  }
 | 
|  
 | 
|  if (prebuilt_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 +58,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_instrumented_libraries_ldflags") {
 | 
|      ldflags = [
 | 
|        # Add a relative RPATH entry to Chromium binaries. This puts instrumented
 | 
|        # DSOs before system-installed versions in library search path.
 | 
| @@ -63,5 +71,8 @@ if (prebuilt_available) {
 | 
|        "-Wl,-z,origin",
 | 
|      ]
 | 
|    }
 | 
| +} else {
 | 
| +  config("prebuilt_instrumented_libraries_ldflags") {
 | 
| +  }
 | 
|  }
 | 
|  # TODO(GYP): Support building instrumented libraries from source.
 | 
| 
 |