Commit 303bc544 authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Add libwayland-client0 to instrumented libraries

This is necessary to reland [1], which caused the MSAN bot to fail
because the system libwayland-client0 was being used.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/2416941

R=msisov
CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux_chromium_msan_rel_ng

Change-Id: I2c2c2394830abda8389704bb61109a361d09aa06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436869
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Reviewed-by: default avatarMaksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#811595}
parent 390ff1d9
...@@ -120,6 +120,7 @@ if (use_locally_built_instrumented_libraries) { ...@@ -120,6 +120,7 @@ if (use_locally_built_instrumented_libraries) {
":libtasn1-6", ":libtasn1-6",
":libunity9", ":libunity9",
":libva1", ":libva1",
":libwayland-client0",
":libx11-6", ":libx11-6",
":libxau6", ":libxau6",
":libxcb1", ":libxcb1",
...@@ -627,12 +628,16 @@ if (use_locally_built_instrumented_libraries) { ...@@ -627,12 +628,16 @@ if (use_locally_built_instrumented_libraries) {
extra_configure_flags = [ "--disable-static" ] extra_configure_flags = [ "--disable-static" ]
pre_build = "scripts/pre-build/libnih1.sh" pre_build = "scripts/pre-build/libnih1.sh"
patch = "patches/libnih1.diff"
} }
instrumented_library("libnih-dbus1") { instrumented_library("libnih-dbus1") {
extra_configure_flags = [ "--disable-static" ] extra_configure_flags = [ "--disable-static" ]
pre_build = "scripts/pre-build/libnih1.sh" pre_build = "scripts/pre-build/libnih1.sh"
patch = "patches/libnih1.diff"
} }
instrumented_library("libnspr4") { instrumented_library("libnspr4") {
...@@ -727,6 +732,14 @@ if (use_locally_built_instrumented_libraries) { ...@@ -727,6 +732,14 @@ if (use_locally_built_instrumented_libraries) {
pre_build = "scripts/pre-build/libva1.sh" pre_build = "scripts/pre-build/libva1.sh"
} }
instrumented_library("libwayland-client0") {
extra_configure_flags = [
"--disable-static",
"--disable-scanner",
"--disable-documentation",
]
}
instrumented_library("libx11-6") { instrumented_library("libx11-6") {
extra_configure_flags = [ extra_configure_flags = [
"--disable-specs", "--disable-specs",
......
92ab0ac3915bc2b50e6a8d7a990522d7355d1ef0 f1e29227f344393fbe410520d9b1b2331017fb52
\ No newline at end of file \ No newline at end of file
b02322f976be38aa177febfc8616546b7a23b25e c67514475887c122e02905a4f184128e3488c07d
\ No newline at end of file \ No newline at end of file
...@@ -29,3 +29,18 @@ diff -rupN ./man/Makefile.l10n ../cups-1.5.3-patched/man/Makefile.l10n ...@@ -29,3 +29,18 @@ diff -rupN ./man/Makefile.l10n ../cups-1.5.3-patched/man/Makefile.l10n
# #
# Make everything... # Make everything...
diff -ru cups-1.7.2.bak/scheduler/conf.h cups-1.7.2/scheduler/conf.h
--- cups-1.7.2.bak/scheduler/conf.h 2020-09-28 13:36:59.018017680 -0700
+++ cups-1.7.2/scheduler/conf.h 2020-09-28 13:36:47.393946500 -0700
@@ -266,9 +266,9 @@
#ifdef HAVE_GSSAPI
VAR char *GSSServiceName VALUE(NULL);
/* GSS service name */
-int HaveServerCreds VALUE(0);
+__attribute__((weak)) int HaveServerCreds VALUE(0);
/* Do we have server credentials? */
-gss_cred_id_t ServerCreds; /* Server's GSS credentials */
+__attribute__((weak)) gss_cred_id_t ServerCreds; /* Server's GSS credentials */
#endif /* HAVE_GSSAPI */
diff -ru libnih-1.0.3.bak/nih-dbus-tool/output.h libnih-1.0.3/nih-dbus-tool/output.h
--- libnih-1.0.3.bak/nih-dbus-tool/output.h 2020-09-28 13:19:09.795416156 -0700
+++ libnih-1.0.3/nih-dbus-tool/output.h 2020-09-28 13:19:29.139536349 -0700
@@ -27,7 +27,7 @@
NIH_BEGIN_EXTERN
-char *output_package;
+extern char *output_package;
int output (const char *source_path, int source_fd,
const char *header_path, int header_fd,
...@@ -52,6 +52,7 @@ libpcre3 \ ...@@ -52,6 +52,7 @@ libpcre3 \
libpixman-1-0 \ libpixman-1-0 \
libpng12-0 \ libpng12-0 \
libunity9 \ libunity9 \
libwayland-client0\
libx11-6 \ libx11-6 \
libxau6 \ libxau6 \
libxcb1 \ libxcb1 \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment