Snap for 11224086 from 6ec837f56b25a7517a3871a6d73701a49c9cf58e to mainline-tzdata5-release
Change-Id: I60f70213fdb9fded69f9f8c9473f9dc37223ca76
diff --git a/Android.bp b/Android.bp
index 5398c397..fc3f076 100644
--- a/Android.bp
+++ b/Android.bp
@@ -441,6 +441,7 @@
cc_test {
name: "kselftest_net_tests",
relative_install_path: "linux-kselftest/net",
+ cflags: ["-Wno-gnu-variable-sized-type-not-at-end"],
srcs: [
"tools/testing/selftests/net/socket.c",
"tools/testing/selftests/net/psock_fanout.c",
diff --git a/OWNERS b/OWNERS
index 01a1d00..c0ae78e 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 391836
drosen@google.com
edliaw@google.com
willmcvicker@google.com
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index fce11f7..6bd56f1 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -2175,6 +2175,9 @@
TEST(negative_ENOSYS)
{
+#if defined(__arm__)
+ SKIP(return, "arm32 does not handle negative syscalls");
+#endif
/*
* There should be no difference between an "internal" skip
* and userspace asking for syscall "-1".
