Move fdtrack APIs to LLNDK. Test: logcat -c; fdtrack_test; logcat -d Change-Id: Ib6f75a7c8bbc4d6efa0708dcbbfe4ad3c0641022 (cherry picked from commit 759625072270f5b6940dae40c8039867a08eff12)
diff --git a/libc/bionic/fdtrack.cpp b/libc/bionic/fdtrack.cpp index 38eb219..1123512 100644 --- a/libc/bionic/fdtrack.cpp +++ b/libc/bionic/fdtrack.cpp
@@ -28,8 +28,7 @@ #include <stdatomic.h> -#include <android/fdtrack.h> - +#include <platform/bionic/fdtrack.h> #include <platform/bionic/reserved_signals.h> #include "private/bionic_fdtrack.h"
diff --git a/libc/libc.map.txt b/libc/libc.map.txt index dddd84c..2ca4b21 100644 --- a/libc/libc.map.txt +++ b/libc/libc.map.txt
@@ -1484,9 +1484,6 @@ global: __mempcpy_chk; __tls_get_addr; # arm64 - android_fdtrack_compare_exchange_hook; - android_fdtrack_get_enabled; - android_fdtrack_set_enabled; call_once; cnd_broadcast; cnd_destroy; @@ -1755,6 +1752,9 @@ __system_property_set_filename; __system_property_update; android_fdsan_get_fd_table; + android_fdtrack_compare_exchange_hook; # llndk + android_fdtrack_get_enabled; # llndk + android_fdtrack_set_enabled; # llndk android_net_res_stats_get_info_for_net; android_net_res_stats_aggregate; android_net_res_stats_get_usable_servers;
diff --git a/libc/include/android/fdtrack.h b/libc/platform/bionic/fdtrack.h similarity index 100% rename from libc/include/android/fdtrack.h rename to libc/platform/bionic/fdtrack.h
diff --git a/libc/private/bionic_fdtrack.h b/libc/private/bionic_fdtrack.h index ddf7249..174ba1d 100644 --- a/libc/private/bionic_fdtrack.h +++ b/libc/private/bionic_fdtrack.h
@@ -31,7 +31,7 @@ #include <sys/cdefs.h> #include <stdatomic.h> -#include <android/fdtrack.h> +#include "platform/bionic/fdtrack.h" #include "bionic/pthread_internal.h" #include "private/bionic_tls.h"
diff --git a/libfdtrack/fdtrack.cpp b/libfdtrack/fdtrack.cpp index 7c4cfbf..0b9963f 100644 --- a/libfdtrack/fdtrack.cpp +++ b/libfdtrack/fdtrack.cpp
@@ -32,7 +32,7 @@ #include <mutex> #include <vector> -#include <android/fdtrack.h> +#include <bionic/fdtrack.h> #include <android-base/no_destructor.h> #include <android-base/thread_annotations.h>
diff --git a/tests/fdtrack_test.cpp b/tests/fdtrack_test.cpp index a616e6f..fca92ce 100644 --- a/tests/fdtrack_test.cpp +++ b/tests/fdtrack_test.cpp
@@ -25,7 +25,7 @@ #include <unistd.h> #if defined(__BIONIC__) -#include <android/fdtrack.h> +#include "platform/bionic/fdtrack.h" #endif #include <vector>