Merge "Migrate Test Targets to New Android Ownership Model" into main
diff --git a/benchmarks/atomic_benchmark.cpp b/benchmarks/atomic_benchmark.cpp
index ea008d4..487b71c 100644
--- a/benchmarks/atomic_benchmark.cpp
+++ b/benchmarks/atomic_benchmark.cpp
@@ -37,6 +37,10 @@
// We assume that the compiler is not smart enough to optimize away fences in a single-threaded
// program. If that changes, we'll need to add a second thread.
+// We're going to use `++` on this volatile in all the tests. This is
+// fine, because we're only using `volatile` in the "don't optimize this out"
+// sense, and don't care whether the increment is atomic or not.
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
static volatile unsigned counter;
std::atomic<int> test_loc(0);
diff --git a/libc/Android.bp b/libc/Android.bp
index eb11fbd..d25671e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1372,75 +1372,6 @@
}
// ========================================================
-// libc_ndk.a
-// Compatibility library for the NDK. This library contains
-// all the parts of libc that are safe to statically link.
-// We can't safely statically link things that can only run
-// on a certain version of the OS. Examples include
-// anything that talks to netd (a large portion of the DNS
-// code) and anything that is dependent on the layout of a
-// data structure that has changed across releases (such as
-// pthread_t).
-// ========================================================
-
-cc_library_static {
- name: "libc_ndk",
- defaults: [
- "libc_defaults",
- "libc_native_allocator_defaults",
- ],
- ramdisk_available: false,
- vendor_ramdisk_available: false,
- srcs: libc_common_src_files + [
- "bionic/gwp_asan_wrappers.cpp",
- "bionic/heap_tagging.cpp",
- "bionic/malloc_common.cpp",
- "bionic/malloc_limit.cpp",
- ],
- multilib: {
- lib32: {
- srcs: libc_common_src_files_32,
- },
- },
- arch: {
- arm: {
- srcs: [
- "arch-arm/bionic/exidx_dynamic.c",
- "arch-common/bionic/crtbegin_so.c",
- "arch-arm/bionic/atexit_legacy.c",
- "arch-common/bionic/crtend_so.S",
- ],
- },
- },
-
- cflags: [
- "-fvisibility=hidden",
- "-DLIBC_STATIC",
- ],
-
- whole_static_libs: [
- "gwp_asan",
- "gwp_asan_crash_handler",
- "libarm-optimized-routines-string",
- "libasync_safe",
- "libc_bionic_ndk",
- "libc_bootstrap",
- "libc_fortify",
- "libc_freebsd",
- "libc_freebsd_large_stack",
- "libc_freebsd_ldexp",
- "libc_gdtoa",
- "libc_netbsd",
- "libc_openbsd_large_stack",
- "libc_openbsd_ndk",
- "libc_syscalls",
- "libc_tzcode",
- "libm",
- "libstdc++",
- ],
-}
-
-// ========================================================
// libc_common.a
// ========================================================