commit 759625072270f5b6940dae40c8039867a08eff12
author Josh Gao <jmgao@google.com> Tue Jan 28 13:24:33 2020 -0800
committer Josh Gao <jmgao@google.com> Thu Jan 30 13:55:10 2020 -0800
tree e0a1227301a6b67509badba95a91998d5c04e18d
parent 97271920bf831610819ddfa44e4e2cc0815afd6e

Move fdtrack APIs to LLNDK.

Test: logcat -c; fdtrack_test; logcat -d
Change-Id: Ib6f75a7c8bbc4d6efa0708dcbbfe4ad3c0641022

libc/bionic/fdtrack.cpp

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"

libc/libc.map.txt

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;

libc/platform/bionic/fdtrack.h

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

libc/private/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"

libfdtrack/fdtrack.cpp

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>

tests/fdtrack_test.cpp

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>