Merge "Add wrappers for pidfd_{open,getfd,send_signal}."diff --git a/libc/Android.bp b/libc/Android.bp
index cafcb91..df8871a 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1289,7 +1289,10 @@
srcs: ["SYSCALLS.TXT"],
tool_files: [":bionic-gensyscalls"],
cmd: "$(location :bionic-gensyscalls) arm $(in) > $(out)",
- bazel_module: { label: "//bionic/libc:syscalls-arm" }
+ bazel_module: {
+ bp2build_available: true,
+ label: "//bionic/libc:syscalls-arm.S"
+ }
}
genrule {
@@ -1298,7 +1301,10 @@
srcs: ["SYSCALLS.TXT"],
tool_files: [":bionic-gensyscalls"],
cmd: "$(location :bionic-gensyscalls) arm64 $(in) > $(out)",
- bazel_module: { label: "//bionic/libc:syscalls-arm64" },
+ bazel_module: {
+ bp2build_available: true,
+ label: "//bionic/libc:syscalls-arm64.S"
+ },
}
genrule {
@@ -1307,7 +1313,10 @@
srcs: ["SYSCALLS.TXT"],
tool_files: [":bionic-gensyscalls"],
cmd: "$(location :bionic-gensyscalls) x86 $(in) > $(out)",
- bazel_module: { label: "//bionic/libc:syscalls-x86" },
+ bazel_module: {
+ bp2build_available: true,
+ label: "//bionic/libc:syscalls-x86.S"
+ },
}
genrule {
@@ -1316,7 +1325,10 @@
srcs: ["SYSCALLS.TXT"],
tool_files: [":bionic-gensyscalls"],
cmd: "$(location :bionic-gensyscalls) x86_64 $(in) > $(out)",
- bazel_module: { label: "//bionic/libc:syscalls-x86_64" },
+ bazel_module: {
+ bp2build_available: true,
+ label: "//bionic/libc:syscalls-x86_64.S"
+ },
}
cc_library_static {
@@ -2083,7 +2095,10 @@
cc_object {
name: "crtbrand",
// crtbrand.c needs <stdint.h> and a #define for the platform SDK version.
- local_include_dirs: ["include"],
+ local_include_dirs: [
+ "include",
+ "private", // crtbrand.S depends on private/bionic_asm_note.h
+ ],
product_variables: {
platform_sdk_version: {
asflags: ["-DPLATFORM_SDK_VERSION=%d"],
@@ -2092,6 +2107,8 @@
srcs: ["arch-common/bionic/crtbrand.S"],
defaults: ["crt_so_defaults"],
+
+ bazel_module: { bp2build_available: true },
}
cc_object {
@@ -2101,7 +2118,9 @@
defaults: ["crt_so_defaults"],
- bazel_module: { bp2build_available: true },
+ bazel_module: {
+ bp2build_available: true,
+ },
}
cc_object {
@@ -2112,6 +2131,8 @@
"crtbegin_so1",
"crtbrand",
],
+
+ bazel_module: { bp2build_available: true },
}
cc_object {
@@ -2148,6 +2169,8 @@
defaults: ["crt_defaults"],
// When using libc.a, we're using the latest library regardless of target API level.
min_sdk_version: "current",
+
+ bazel_module: { bp2build_available: true },
}
cc_object {
@@ -2178,6 +2201,8 @@
},
},
defaults: ["crt_defaults"],
+
+ bazel_module: { bp2build_available: true },
}
cc_object {
@@ -2372,6 +2397,8 @@
"kernel/uapi/asm-arm",
"kernel/uapi",
],
+
+ bazel_module: { bp2build_available: true },
}
cc_object {
@@ -2381,6 +2408,8 @@
"kernel/uapi/asm-arm64",
"kernel/uapi",
],
+
+ bazel_module: { bp2build_available: true },
}
cc_object {
@@ -2392,6 +2421,8 @@
"kernel/uapi/asm-x86",
"kernel/uapi",
],
+
+ bazel_module: { bp2build_available: true },
}
cc_object {
@@ -2403,6 +2434,8 @@
"kernel/uapi/asm-x86",
"kernel/uapi",
],
+
+ bazel_module: { bp2build_available: true },
}
filegroup {
diff --git a/libc/BUILD.bazel b/libc/BUILD.bazel
deleted file mode 100644
index 2fda45f..0000000
--- a/libc/BUILD.bazel
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file added for experimental interoperability with Bazel.
-package(
- default_visibility = ["@//:__pkg__"],
-)
-
-genrule(
- name = "syscalls-arm",
- outs = ["syscalls-arm.S"],
- srcs = ["SYSCALLS.TXT"],
- tools = ["//bionic/libc/tools:bionic-gensyscalls"],
- cmd = "$(location //bionic/libc/tools:bionic-gensyscalls) arm $< > $@",
-)
-
-genrule(
- name = "syscalls-arm64",
- outs = ["syscalls-arm64.S"],
- srcs = ["SYSCALLS.TXT"],
- tools = ["//bionic/libc/tools:bionic-gensyscalls"],
- cmd = "$(location //bionic/libc/tools:bionic-gensyscalls) arm64 $< > $@",
-)
-
-genrule(
- name = "syscalls-x86",
- outs = ["syscalls-x86.S"],
- srcs = ["SYSCALLS.TXT"],
- tools = ["//bionic/libc/tools:bionic-gensyscalls"],
- cmd = "$(location //bionic/libc/tools:bionic-gensyscalls) x86 $< > $@",
-)
-
-genrule(
- name = "syscalls-x86_64",
- outs = ["syscalls-x86_64.S"],
- srcs = ["SYSCALLS.TXT"],
- tools = ["//bionic/libc/tools:bionic-gensyscalls"],
- cmd = "$(location //bionic/libc/tools:bionic-gensyscalls) x86_64 $< > $@",
-)
diff --git a/libc/bionic/bionic_appcompat.h b/libc/bionic/bionic_appcompat.h
index fd37035..e67e50c 100644
--- a/libc/bionic/bionic_appcompat.h
+++ b/libc/bionic/bionic_appcompat.h
@@ -31,11 +31,13 @@
constexpr int MAX_PACKAGE_NAME_LENGTH = 230;
static inline const char* const soft_mac_bind_allowlist[] = {
+ "com.cisco.anyconnect.vpn.android.avf:nchs",
"com.skype.raider",
nullptr,
};
static inline const char* const soft_mac_getlink_allowlist[] = {
+ "com.cisco.anyconnect.vpn.android.avf:nchs",
nullptr,
};
diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp
index 01cd2e5..a710fa8 100644
--- a/libc/bionic/libc_init_common.cpp
+++ b/libc/bionic/libc_init_common.cpp
@@ -86,6 +86,7 @@
_thread_arc4_lock();
}
+__BIONIC_WEAK_FOR_NATIVE_BRIDGE
void __libc_init_scudo() {
// Heap tagging level *must* be set before interacting with Scudo, otherwise
// the primary will be mapped with PROT_MTE even if MTE is is not enabled in
diff --git a/libc/tools/Android.bp b/libc/tools/Android.bp
index 0b0b240..575a31a 100644
--- a/libc/tools/Android.bp
+++ b/libc/tools/Android.bp
@@ -10,7 +10,8 @@
filegroup {
name: "bionic-gensyscalls",
- srcs: ["gensyscalls.py"]
+ srcs: ["gensyscalls.py"],
+ bazel_module: { bp2build_available: true },
}
// Generate the C++ policy sources for app and system seccomp-bpf filters.
diff --git a/libc/tools/BUILD.bazel b/libc/tools/BUILD.bazel
deleted file mode 100644
index 469cfab..0000000
--- a/libc/tools/BUILD.bazel
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file added for experimental interoperability with Bazel.
-package(default_visibility = ["//visibility:private"])
-
-filegroup(
- name = "bionic-gensyscalls",
- srcs = ["gensyscalls.py"],
- visibility = ["//bionic/libc:__pkg__"],
-)