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

Unified Diff: third_party/instrumented_libraries/BUILD.gn

Issue 2031903002: Update GN files w/ changes needed to make sanitizers work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rework to add comments, drop the symbolized config Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698