Move ndk-cruft symbols to LIBC_PRIVATE
Bug: http://b/26385283
Change-Id: Idca71396f9de4141eefc4e1851ba92ebff1ac792
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index e044653..94e4b80 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -120,7 +120,6 @@
__pselect6; # arm x86 mips
__pthread_cleanup_pop;
__pthread_cleanup_push;
- __pthread_gettid; # arm x86 mips nobrillo
__ptrace; # arm x86 mips
__putlong;
__putshort;
@@ -159,7 +158,6 @@
__sched_cpucount;
__sched_cpufree;
__sched_getaffinity; # arm x86 mips
- __set_errno; # arm x86 mips nobrillo
__set_thread_area; # x86
__set_tid_address; # arm x86 mips
__sF;
@@ -241,9 +239,7 @@
android_gethostbynamefornet;
android_set_abort_message;
arc4random;
- arc4random_addrandom; # arm x86 mips nobrillo
arc4random_buf;
- arc4random_stir; # arm x86 mips nobrillo
arc4random_uniform;
asctime;
asctime64; # arm x86 mips
@@ -257,11 +253,9 @@
atoll;
basename;
basename_r; # arm x86 mips
- bcopy; # arm x86 mips nobrillo
bind;
bindresvport;
brk;
- bsd_signal; # arm x86 mips nobrillo
bsearch;
btowc;
bzero; # arm x86 mips
@@ -316,7 +310,6 @@
dup3;
duplocale;
endmntent;
- endpwent; # arm x86 mips nobrillo
endservent;
endutent;
environ;
@@ -363,7 +356,6 @@
fdatasync;
fdopen;
fdopendir;
- fdprintf; # arm x86 mips nobrillo
feof;
feof_unlocked;
ferror;
@@ -415,7 +407,6 @@
fsync;
ftell;
ftello;
- ftime; # arm x86 mips nobrillo
ftok;
ftruncate;
ftruncate64;
@@ -447,8 +438,6 @@
getchar_unlocked;
getcwd;
getdelim;
- getdents; # arm x86 mips nobrillo
- getdtablesize; # arm x86 mips nobrillo
getegid;
getenv;
geteuid;
@@ -523,7 +512,6 @@
if_nametoindex;
imaxabs;
imaxdiv;
- index; # arm x86 mips nobrillo
inet_addr;
inet_aton;
inet_lnaof;
@@ -576,7 +564,6 @@
isprint_l;
ispunct;
ispunct_l;
- issetugid; # arm x86 mips nobrillo
isspace;
isspace_l;
isupper;
@@ -666,7 +653,6 @@
mempcpy;
memrchr;
memset;
- memswap; # arm x86 mips nobrillo
mincore;
mkdir;
mkdirat;
@@ -757,7 +743,6 @@
pthread_attr_getschedpolicy;
pthread_attr_getscope;
pthread_attr_getstack;
- pthread_attr_getstackaddr; # arm x86 mips nobrillo
pthread_attr_getstacksize;
pthread_attr_init;
pthread_attr_setdetachstate;
@@ -766,7 +751,6 @@
pthread_attr_setschedpolicy;
pthread_attr_setscope;
pthread_attr_setstack;
- pthread_attr_setstackaddr; # arm x86 mips nobrillo
pthread_attr_setstacksize;
pthread_cond_broadcast;
pthread_cond_destroy;
@@ -1024,8 +1008,6 @@
strncpy;
strndup;
strnlen;
- strntoimax; # arm x86 mips nobrillo
- strntoumax; # arm x86 mips nobrillo
strpbrk;
strptime;
strrchr;
@@ -1044,7 +1026,6 @@
strtoll;
strtoll_l;
strtoq;
- strtotimeval; # arm x86 mips nobrillo
strtoul;
strtoull;
strtoull_l;
@@ -1066,7 +1047,6 @@
sysinfo;
syslog;
system;
- sysv_signal; # arm x86 mips nobrillo
tcdrain;
tcflow;
tcflush;
@@ -1098,7 +1078,6 @@
timerfd_settime;
times;
timezone;
- tkill; # arm x86 mips nobrillo
tmpfile;
tmpnam;
toascii;
@@ -1140,7 +1119,6 @@
vdprintf;
verr;
verrx;
- vfdprintf; # arm x86 mips nobrillo
vfork;
vfprintf;
vfscanf;
@@ -1160,7 +1138,6 @@
vwprintf;
vwscanf;
wait;
- wait3; # arm x86 mips nobrillo
wait4;
waitid;
waitpid;
@@ -1209,7 +1186,6 @@
wcstoull;
wcstoull_l;
wcstoumax;
- wcswcs; # arm x86 mips nobrillo
wcswidth;
wcsxfrm;
wcsxfrm_l;
@@ -1280,8 +1256,10 @@
__page_shift; # arm x86 mips nobrillo
__page_size; # arm x86 mips nobrillo
__popcountsi2; # arm x86 mips
+ __pthread_gettid; # arm x86 mips nobrillo
__sclose; # arm x86 mips
__sdidinit; # arm x86 mips nobrillo
+ __set_errno; # arm x86 mips nobrillo
__sflags; # arm x86 mips
__sflush; # arm x86 mips
__sfp; # arm x86 mips
@@ -1299,15 +1277,37 @@
__umoddi3; # x86 mips
__wait4; # arm x86 mips nobrillo
_fwalk; # arm x86 mips
+ arc4random_addrandom; # arm x86 mips nobrillo
+ arc4random_stir; # arm x86 mips nobrillo
+ bcopy; # arm x86 mips nobrillo
+ bsd_signal; # arm x86 mips nobrillo
dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm x86 mips nobrillo
dlmalloc_trim; # arm x86 mips nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo
+ endpwent; # arm x86 mips nobrillo
+ fdprintf; # arm x86 mips nobrillo
free_malloc_leak_info;
+ ftime; # arm x86 mips nobrillo
get_malloc_leak_info;
+ getdents; # arm x86 mips nobrillo
+ getdtablesize; # arm x86 mips nobrillo
gMallocLeakZygoteChild;
+ index; # arm x86 mips nobrillo
+ issetugid; # arm x86 mips nobrillo
+ memswap; # arm x86 mips nobrillo
+ pthread_attr_getstackaddr; # arm x86 mips nobrillo
+ pthread_attr_setstackaddr; # arm x86 mips nobrillo
SHA1Final; # arm x86 mips
SHA1Init; # arm x86 mips
SHA1Transform; # arm x86 mips
SHA1Update; # arm x86 mips
+ strntoimax; # arm x86 mips nobrillo
+ strntoumax; # arm x86 mips nobrillo
+ strtotimeval; # arm x86 mips nobrillo
+ sysv_signal; # arm x86 mips nobrillo
+ tkill; # arm x86 mips nobrillo
+ vfdprintf; # arm x86 mips nobrillo
+ wait3; # arm x86 mips nobrillo
+ wcswcs; # arm x86 mips nobrillo
} LIBC_N;