| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/sanitizers/sanitizers.gni") | 5 import("//build/config/sanitizers/sanitizers.gni") |
| 6 | 6 |
| 7 prebuilt_available = | 7 prebuilt_available = |
| 8 is_msan && (msan_track_origins == 0 || msan_track_origins == 2) | 8 is_msan && (msan_track_origins == 0 || msan_track_origins == 2) |
| 9 | 9 |
| 10 group("deps") { | 10 group("deps") { |
| 11 if (use_prebuilt_instrumented_libraries) { | 11 if (use_prebuilt_instrumented_libraries) { |
| 12 assert(prebuilt_available, | 12 assert(prebuilt_available, |
| 13 "Prebuilt instrumented libraries are only available when " + | 13 "Prebuilt instrumented libraries are only available when " + |
| 14 "is_msan = true and msan_track_origins = {0, 2}") | 14 "is_msan = true and msan_track_origins = {0, 2}") |
| 15 deps = [ | 15 deps = [ |
| 16 ":prebuilt", | 16 ":prebuilt", |
| 17 ] | 17 ] |
| 18 data = [ |
| 19 "$root_out_dir/instrumented_libraries_prebuilt/", |
| 20 ] |
| 18 } | 21 } |
| 19 } | 22 } |
| 20 | 23 |
| 21 if (prebuilt_available) { | 24 if (prebuilt_available) { |
| 22 group("prebuilt") { | 25 group("prebuilt") { |
| 23 visibility = [ ":deps" ] | 26 visibility = [ ":deps" ] |
| 24 all_dependent_configs = [ ":prebuilt_link_helper" ] | 27 |
| 28 # all_dependent_configs = [ ":prebuilt_link_helper" ] |
| 25 deps = [ | 29 deps = [ |
| 26 ":extract_prebuilt_instrumented_libraries", | 30 ":extract_prebuilt_instrumented_libraries", |
| 27 ] | 31 ] |
| 28 } | 32 } |
| 29 | 33 |
| 30 if (is_msan) { | 34 if (is_msan) { |
| 31 sanitizer_type = "msan" | 35 sanitizer_type = "msan" |
| 32 if (msan_track_origins == 0) { | 36 if (msan_track_origins == 0) { |
| 33 archive_prefix = "msan-no-origins" | 37 archive_prefix = "msan-no-origins" |
| 34 } else if (msan_track_origins == 2) { | 38 } else if (msan_track_origins == 2) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 48 rebase_path("binaries"), | 52 rebase_path("binaries"), |
| 49 rebase_path(root_build_dir + "/instrumented_libraries_prebuilt"), | 53 rebase_path(root_build_dir + "/instrumented_libraries_prebuilt"), |
| 50 rebase_path(target_out_dir, root_build_dir), | 54 rebase_path(target_out_dir, root_build_dir), |
| 51 ] | 55 ] |
| 52 outputs = [ | 56 outputs = [ |
| 53 "$target_out_dir/$archive_prefix.txt", | 57 "$target_out_dir/$archive_prefix.txt", |
| 54 ] | 58 ] |
| 55 } | 59 } |
| 56 | 60 |
| 57 config("prebuilt_link_helper") { | 61 config("prebuilt_link_helper") { |
| 58 visibility = [ ":prebuilt" ] | |
| 59 ldflags = [ | 62 ldflags = [ |
| 60 # Add a relative RPATH entry to Chromium binaries. This puts instrumented | 63 # Add a relative RPATH entry to Chromium binaries. This puts instrumented |
| 61 # DSOs before system-installed versions in library search path. | 64 # DSOs before system-installed versions in library search path. |
| 62 "-Wl,-R,\$ORIGIN/instrumented_libraries_prebuilt/$sanitizer_type/lib", | 65 "-Wl,-R,\$ORIGIN/instrumented_libraries_prebuilt/$sanitizer_type/lib", |
| 63 "-Wl,-z,origin", | 66 "-Wl,-z,origin", |
| 64 ] | 67 ] |
| 65 } | 68 } |
| 69 } else { |
| 70 config("prebuilt_link_helper") { |
| 71 } |
| 66 } | 72 } |
| 67 # TODO(GYP): Support building instrumented libraries from source. | 73 # TODO(GYP): Support building instrumented libraries from source. |
| OLD | NEW |