Generate libc version-script for brillo

Brillo doesn't use the ndk cruft, so we need
separate set of version scripts. Added new "nobrillo"
tag to mark such symbols in *.map.txt files.

Bug: http://b/26164862
Change-Id: Iaee1b7119f75b68c2971679fc32817e6df29fd94
This commit is contained in:
Dimitry Ivanov 2015-12-14 14:07:52 -08:00
parent a3dd076126
commit 585e959849
15 changed files with 7724 additions and 177 deletions

View File

@ -1386,6 +1386,12 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
$(LOCAL_PATH)/libc.mips64.map \
$(LOCAL_PATH)/libc.x86.map \
$(LOCAL_PATH)/libc.x86_64.map \
$(LOCAL_PATH)/libc.arm.brillo.map \
$(LOCAL_PATH)/libc.arm64.brillo.map \
$(LOCAL_PATH)/libc.mips.brillo.map \
$(LOCAL_PATH)/libc.mips64.brillo.map \
$(LOCAL_PATH)/libc.x86.brillo.map \
$(LOCAL_PATH)/libc.x86_64.brillo.map \
# Leave the symbols in the shared library so that stack unwinders can produce
# meaningful name resolution.
@ -1417,12 +1423,21 @@ LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
# Don't re-export new/delete and friends, even if the compiler really wants to.
ifdef BRILLO
LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.brillo.map
LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.brillo.map
LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.brillo.map
LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.brillo.map
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.brillo.map
LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.brillo.map
else
LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.map
LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map
LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.map
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map
LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
endif
# We'd really like to do this for all architectures, but since this wasn't done
# before, these symbols must continue to be exported on LP32 for binary

1420
libc/libc.arm.brillo.map Normal file

File diff suppressed because it is too large Load Diff

View File

@ -58,13 +58,13 @@ LIBC {
__freadable;
__fsetlocking;
__fstatfs64; # arm x86 mips
__futex_wait; # arm x86 mips
__futex_wake; # arm x86 mips
__futex_wait; # arm x86 mips nobrillo
__futex_wake; # arm x86 mips nobrillo
__fwritable;
__gedf2; # arm
__get_h_errno;
__get_thread; # arm x86 mips
__get_tls; # arm x86 mips
__get_thread; # arm x86 mips nobrillo
__get_tls; # arm x86 mips nobrillo
__getcpu; # arm x86 mips
__getcwd; # arm x86 mips
__getdents64; # arm x86 mips
@ -131,7 +131,7 @@ LIBC {
__ns_skiprr; # arm x86 mips
__ns_sprintrr; # arm x86 mips
__ns_sprintrrf; # arm x86 mips
__open; # arm x86 mips
__open; # arm x86 mips nobrillo
__open_2;
__openat; # arm x86 mips
__openat_2;
@ -148,8 +148,8 @@ LIBC {
__p_time;
__p_type;
__p_type_syms;
__page_shift; # arm x86 mips
__page_size; # arm x86 mips
__page_shift; # arm x86 mips nobrillo
__page_size; # arm x86 mips nobrillo
__poll_chk;
__popcount_tab; # arm
__popcountsi2; # arm x86 mips
@ -161,7 +161,7 @@ LIBC {
__pselect6; # arm x86 mips
__pthread_cleanup_pop;
__pthread_cleanup_push;
__pthread_gettid; # arm x86 mips
__pthread_gettid; # arm x86 mips nobrillo
__ptrace; # arm x86 mips
__putlong;
__putshort;
@ -202,8 +202,8 @@ LIBC {
__sched_cpufree;
__sched_getaffinity; # arm x86 mips
__sclose; # arm x86 mips
__sdidinit; # arm x86 mips
__set_errno; # arm x86 mips
__sdidinit; # arm x86 mips nobrillo
__set_errno; # arm x86 mips nobrillo
__set_tid_address; # arm x86 mips
__set_tls; # arm mips
__sF;
@ -213,7 +213,7 @@ LIBC {
__sglue; # arm x86 mips
__sigaction; # arm x86 mips
__signalfd4; # arm x86 mips
__sinit; # arm x86 mips
__sinit; # arm x86 mips nobrillo
__smakebuf; # arm x86 mips
__snprintf_chk;
__socket; # arm x86 mips
@ -274,7 +274,7 @@ LIBC {
__unordsf2; # arm
__vsnprintf_chk;
__vsprintf_chk;
__wait4; # arm x86 mips
__wait4; # arm x86 mips nobrillo
__waitid; # arm x86 mips
_ctype_;
_Exit;
@ -307,9 +307,9 @@ LIBC {
android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_addrandom; # arm x86 mips
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_buf;
arc4random_stir; # arm x86 mips
arc4random_stir; # arm x86 mips nobrillo
arc4random_uniform;
asctime;
asctime64; # arm x86 mips
@ -323,11 +323,11 @@ LIBC {
atoll;
basename;
basename_r; # arm x86 mips
bcopy; # arm x86 mips
bcopy; # arm x86 mips nobrillo
bind;
bindresvport;
brk;
bsd_signal; # arm x86 mips
bsd_signal; # arm x86 mips nobrillo
bsearch;
btowc;
bzero; # arm x86 mips
@ -383,7 +383,7 @@ LIBC {
dup3;
duplocale;
endmntent;
endpwent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent;
endutent;
environ;
@ -430,7 +430,7 @@ LIBC {
fdatasync;
fdopen;
fdopendir;
fdprintf; # arm x86 mips
fdprintf; # arm x86 mips nobrillo
feof;
feof_unlocked;
ferror;
@ -483,7 +483,7 @@ LIBC {
fsync;
ftell;
ftello;
ftime; # arm x86 mips
ftime; # arm x86 mips nobrillo
ftok;
ftruncate;
ftruncate64;
@ -516,8 +516,8 @@ LIBC {
getchar_unlocked;
getcwd;
getdelim;
getdents; # arm x86 mips
getdtablesize; # arm x86 mips
getdents; # arm x86 mips nobrillo
getdtablesize; # arm x86 mips nobrillo
getegid;
getenv;
geteuid;
@ -592,7 +592,7 @@ LIBC {
if_nametoindex;
imaxabs;
imaxdiv;
index; # arm x86 mips
index; # arm x86 mips nobrillo
inet_addr;
inet_aton;
inet_lnaof;
@ -645,7 +645,7 @@ LIBC {
isprint_l;
ispunct;
ispunct_l;
issetugid; # arm x86 mips
issetugid; # arm x86 mips nobrillo
isspace;
isspace_l;
isupper;
@ -735,7 +735,7 @@ LIBC {
mempcpy;
memrchr;
memset;
memswap; # arm x86 mips
memswap; # arm x86 mips nobrillo
mincore;
mkdir;
mkdirat;
@ -826,7 +826,7 @@ LIBC {
pthread_attr_getschedpolicy;
pthread_attr_getscope;
pthread_attr_getstack;
pthread_attr_getstackaddr; # arm x86 mips
pthread_attr_getstackaddr; # arm x86 mips nobrillo
pthread_attr_getstacksize;
pthread_attr_init;
pthread_attr_setdetachstate;
@ -835,7 +835,7 @@ LIBC {
pthread_attr_setschedpolicy;
pthread_attr_setscope;
pthread_attr_setstack;
pthread_attr_setstackaddr; # arm x86 mips
pthread_attr_setstackaddr; # arm x86 mips nobrillo
pthread_attr_setstacksize;
pthread_cond_broadcast;
pthread_cond_destroy;
@ -1094,8 +1094,8 @@ LIBC {
strncpy;
strndup;
strnlen;
strntoimax; # arm x86 mips
strntoumax; # arm x86 mips
strntoimax; # arm x86 mips nobrillo
strntoumax; # arm x86 mips nobrillo
strpbrk;
strptime;
strrchr;
@ -1114,7 +1114,7 @@ LIBC {
strtoll;
strtoll_l;
strtoq;
strtotimeval; # arm x86 mips
strtotimeval; # arm x86 mips nobrillo
strtoul;
strtoull;
strtoull_l;
@ -1136,7 +1136,7 @@ LIBC {
sysinfo;
syslog;
system;
sysv_signal; # arm x86 mips
sysv_signal; # arm x86 mips nobrillo
tcdrain;
tcflow;
tcflush;
@ -1168,7 +1168,7 @@ LIBC {
timerfd_settime;
times;
timezone;
tkill; # arm x86 mips
tkill; # arm x86 mips nobrillo
tmpfile;
tmpnam;
toascii;
@ -1210,7 +1210,7 @@ LIBC {
vdprintf;
verr;
verrx;
vfdprintf; # arm x86 mips
vfdprintf; # arm x86 mips nobrillo
vfork;
vfprintf;
vfscanf;
@ -1230,7 +1230,7 @@ LIBC {
vwprintf;
vwscanf;
wait;
wait3; # arm x86 mips
wait3; # arm x86 mips nobrillo
wait4;
waitid;
waitpid;
@ -1279,7 +1279,7 @@ LIBC {
wcstoull;
wcstoull_l;
wcstoumax;
wcswcs; # arm x86 mips
wcswcs; # arm x86 mips nobrillo
wcswidth;
wcsxfrm;
wcsxfrm_l;
@ -1446,10 +1446,10 @@ LIBC_PRIVATE {
_Unwind_VRS_Pop; # arm
_Unwind_VRS_Set; # arm
atexit; # arm
dlmalloc; # arm x86 mips
dlmalloc_inspect_all;
dlmalloc_trim;
dlmalloc_usable_size; # arm x86 mips
dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips
SHA1Init; # arm x86 mips

1185
libc/libc.arm64.brillo.map Normal file

File diff suppressed because it is too large Load Diff

View File

@ -241,7 +241,7 @@ LIBC {
dup3;
duplocale;
endmntent;
endpwent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent;
endutent;
environ;
@ -1182,7 +1182,7 @@ LIBC_N {
LIBC_PRIVATE {
global:
dlmalloc_inspect_all;
dlmalloc_trim;
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
gMallocLeakZygoteChild;
} LIBC_N;

View File

@ -58,13 +58,13 @@ LIBC {
__freadable;
__fsetlocking;
__fstatfs64; # arm x86 mips
__futex_wait; # arm x86 mips
__futex_wake; # arm x86 mips
__futex_wait; # arm x86 mips nobrillo
__futex_wake; # arm x86 mips nobrillo
__fwritable;
__gedf2; # arm
__get_h_errno;
__get_thread; # arm x86 mips
__get_tls; # arm x86 mips
__get_thread; # arm x86 mips nobrillo
__get_tls; # arm x86 mips nobrillo
__getcpu; # arm x86 mips
__getcwd; # arm x86 mips
__getdents64; # arm x86 mips
@ -132,7 +132,7 @@ LIBC {
__ns_skiprr; # arm x86 mips
__ns_sprintrr; # arm x86 mips
__ns_sprintrrf; # arm x86 mips
__open; # arm x86 mips
__open; # arm x86 mips nobrillo
__open_2;
__openat; # arm x86 mips
__openat_2;
@ -149,8 +149,8 @@ LIBC {
__p_time;
__p_type;
__p_type_syms;
__page_shift; # arm x86 mips
__page_size; # arm x86 mips
__page_shift; # arm x86 mips nobrillo
__page_size; # arm x86 mips nobrillo
__poll_chk;
__popcount_tab; # arm
__popcountsi2; # arm x86 mips
@ -162,7 +162,7 @@ LIBC {
__pselect6; # arm x86 mips
__pthread_cleanup_pop;
__pthread_cleanup_push;
__pthread_gettid; # arm x86 mips
__pthread_gettid; # arm x86 mips nobrillo
__ptrace; # arm x86 mips
__putlong;
__putshort;
@ -203,8 +203,8 @@ LIBC {
__sched_cpufree;
__sched_getaffinity; # arm x86 mips
__sclose; # arm x86 mips
__sdidinit; # arm x86 mips
__set_errno; # arm x86 mips
__sdidinit; # arm x86 mips nobrillo
__set_errno; # arm x86 mips nobrillo
__set_thread_area; # x86
__set_tid_address; # arm x86 mips
__set_tls; # arm mips
@ -215,7 +215,7 @@ LIBC {
__sglue; # arm x86 mips
__sigaction; # arm x86 mips
__signalfd4; # arm x86 mips
__sinit; # arm x86 mips
__sinit; # arm x86 mips nobrillo
__smakebuf; # arm x86 mips
__snprintf_chk;
__socket; # arm x86 mips
@ -277,7 +277,7 @@ LIBC {
__unordsf2; # arm
__vsnprintf_chk;
__vsprintf_chk;
__wait4; # arm x86 mips
__wait4; # arm x86 mips nobrillo
__waitid; # arm x86 mips
_ctype_;
_Exit;
@ -311,9 +311,9 @@ LIBC {
android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_addrandom; # arm x86 mips
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_buf;
arc4random_stir; # arm x86 mips
arc4random_stir; # arm x86 mips nobrillo
arc4random_uniform;
asctime;
asctime64; # arm x86 mips
@ -327,11 +327,11 @@ LIBC {
atoll;
basename;
basename_r; # arm x86 mips
bcopy; # arm x86 mips
bcopy; # arm x86 mips nobrillo
bind;
bindresvport;
brk;
bsd_signal; # arm x86 mips
bsd_signal; # arm x86 mips nobrillo
bsearch;
btowc;
bzero; # arm x86 mips
@ -387,7 +387,7 @@ LIBC {
dup3;
duplocale;
endmntent;
endpwent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent;
endutent;
environ;
@ -434,7 +434,7 @@ LIBC {
fdatasync;
fdopen;
fdopendir;
fdprintf; # arm x86 mips
fdprintf; # arm x86 mips nobrillo
feof;
feof_unlocked;
ferror;
@ -487,7 +487,7 @@ LIBC {
fsync;
ftell;
ftello;
ftime; # arm x86 mips
ftime; # arm x86 mips nobrillo
ftok;
ftruncate;
ftruncate64;
@ -520,8 +520,8 @@ LIBC {
getchar_unlocked;
getcwd;
getdelim;
getdents; # arm x86 mips
getdtablesize; # arm x86 mips
getdents; # arm x86 mips nobrillo
getdtablesize; # arm x86 mips nobrillo
getegid;
getenv;
geteuid;
@ -596,7 +596,7 @@ LIBC {
if_nametoindex;
imaxabs;
imaxdiv;
index; # arm x86 mips
index; # arm x86 mips nobrillo
inet_addr;
inet_aton;
inet_lnaof;
@ -649,7 +649,7 @@ LIBC {
isprint_l;
ispunct;
ispunct_l;
issetugid; # arm x86 mips
issetugid; # arm x86 mips nobrillo
isspace;
isspace_l;
isupper;
@ -739,7 +739,7 @@ LIBC {
mempcpy;
memrchr;
memset;
memswap; # arm x86 mips
memswap; # arm x86 mips nobrillo
mincore;
mkdir;
mkdirat;
@ -853,7 +853,7 @@ LIBC {
pthread_attr_getschedpolicy;
pthread_attr_getscope;
pthread_attr_getstack;
pthread_attr_getstackaddr; # arm x86 mips
pthread_attr_getstackaddr; # arm x86 mips nobrillo
pthread_attr_getstacksize;
pthread_attr_init;
pthread_attr_setdetachstate;
@ -862,7 +862,7 @@ LIBC {
pthread_attr_setschedpolicy;
pthread_attr_setscope;
pthread_attr_setstack;
pthread_attr_setstackaddr; # arm x86 mips
pthread_attr_setstackaddr; # arm x86 mips nobrillo
pthread_attr_setstacksize;
pthread_cond_broadcast;
pthread_cond_destroy;
@ -1121,8 +1121,8 @@ LIBC {
strncpy;
strndup;
strnlen;
strntoimax; # arm x86 mips
strntoumax; # arm x86 mips
strntoimax; # arm x86 mips nobrillo
strntoumax; # arm x86 mips nobrillo
strpbrk;
strptime;
strrchr;
@ -1141,7 +1141,7 @@ LIBC {
strtoll;
strtoll_l;
strtoq;
strtotimeval; # arm x86 mips
strtotimeval; # arm x86 mips nobrillo
strtoul;
strtoull;
strtoull_l;
@ -1163,7 +1163,7 @@ LIBC {
sysinfo;
syslog;
system;
sysv_signal; # arm x86 mips
sysv_signal; # arm x86 mips nobrillo
tcdrain;
tcflow;
tcflush;
@ -1195,7 +1195,7 @@ LIBC {
timerfd_settime;
times;
timezone;
tkill; # arm x86 mips
tkill; # arm x86 mips nobrillo
tmpfile;
tmpnam;
toascii;
@ -1237,7 +1237,7 @@ LIBC {
vdprintf;
verr;
verrx;
vfdprintf; # arm x86 mips
vfdprintf; # arm x86 mips nobrillo
vfork;
vfprintf;
vfscanf;
@ -1257,7 +1257,7 @@ LIBC {
vwprintf;
vwscanf;
wait;
wait3; # arm x86 mips
wait3; # arm x86 mips nobrillo
wait4;
waitid;
waitpid;
@ -1306,7 +1306,7 @@ LIBC {
wcstoull;
wcstoull_l;
wcstoumax;
wcswcs; # arm x86 mips
wcswcs; # arm x86 mips nobrillo
wcswidth;
wcsxfrm;
wcsxfrm_l;
@ -1473,10 +1473,10 @@ LIBC_PRIVATE {
_Unwind_VRS_Pop; # arm
_Unwind_VRS_Set; # arm
atexit; # arm
dlmalloc; # arm x86 mips
dlmalloc_inspect_all;
dlmalloc_trim;
dlmalloc_usable_size; # arm x86 mips
dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips
SHA1Init; # arm x86 mips

1276
libc/libc.mips.brillo.map Normal file

File diff suppressed because it is too large Load Diff

View File

@ -38,12 +38,12 @@ LIBC {
__freadable;
__fsetlocking;
__fstatfs64; # arm x86 mips
__futex_wait; # arm x86 mips
__futex_wake; # arm x86 mips
__futex_wait; # arm x86 mips nobrillo
__futex_wake; # arm x86 mips nobrillo
__fwritable;
__get_h_errno;
__get_thread; # arm x86 mips
__get_tls; # arm x86 mips
__get_thread; # arm x86 mips nobrillo
__get_tls; # arm x86 mips nobrillo
__getcpu; # arm x86 mips
__getcwd; # arm x86 mips
__getdents64; # arm x86 mips
@ -101,7 +101,7 @@ LIBC {
__ns_skiprr; # arm x86 mips
__ns_sprintrr; # arm x86 mips
__ns_sprintrrf; # arm x86 mips
__open; # arm x86 mips
__open; # arm x86 mips nobrillo
__open_2;
__openat; # arm x86 mips
__openat_2;
@ -118,8 +118,8 @@ LIBC {
__p_time;
__p_type;
__p_type_syms;
__page_shift; # arm x86 mips
__page_size; # arm x86 mips
__page_shift; # arm x86 mips nobrillo
__page_size; # arm x86 mips nobrillo
__poll_chk;
__popcountsi2; # arm x86 mips
__ppoll; # arm x86 mips
@ -130,7 +130,7 @@ LIBC {
__pselect6; # arm x86 mips
__pthread_cleanup_pop;
__pthread_cleanup_push;
__pthread_gettid; # arm x86 mips
__pthread_gettid; # arm x86 mips nobrillo
__ptrace; # arm x86 mips
__putlong;
__putshort;
@ -170,8 +170,8 @@ LIBC {
__sched_cpufree;
__sched_getaffinity; # arm x86 mips
__sclose; # arm x86 mips
__sdidinit; # arm x86 mips
__set_errno; # arm x86 mips
__sdidinit; # arm x86 mips nobrillo
__set_errno; # arm x86 mips nobrillo
__set_tid_address; # arm x86 mips
__set_tls; # arm mips
__sF;
@ -181,7 +181,7 @@ LIBC {
__sglue; # arm x86 mips
__sigaction; # arm x86 mips
__signalfd4; # arm x86 mips
__sinit; # arm x86 mips
__sinit; # arm x86 mips nobrillo
__smakebuf; # arm x86 mips
__snprintf_chk;
__socket; # arm x86 mips
@ -237,7 +237,7 @@ LIBC {
__umoddi3; # x86 mips
__vsnprintf_chk;
__vsprintf_chk;
__wait4; # arm x86 mips
__wait4; # arm x86 mips nobrillo
__waitid; # arm x86 mips
_ctype_;
_Exit;
@ -271,9 +271,9 @@ LIBC {
android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_addrandom; # arm x86 mips
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_buf;
arc4random_stir; # arm x86 mips
arc4random_stir; # arm x86 mips nobrillo
arc4random_uniform;
asctime;
asctime64; # arm x86 mips
@ -287,11 +287,11 @@ LIBC {
atoll;
basename;
basename_r; # arm x86 mips
bcopy; # arm x86 mips
bcopy; # arm x86 mips nobrillo
bind;
bindresvport;
brk;
bsd_signal; # arm x86 mips
bsd_signal; # arm x86 mips nobrillo
bsearch;
btowc;
bzero; # arm x86 mips
@ -347,7 +347,7 @@ LIBC {
dup3;
duplocale;
endmntent;
endpwent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent;
endutent;
environ;
@ -394,7 +394,7 @@ LIBC {
fdatasync;
fdopen;
fdopendir;
fdprintf; # arm x86 mips
fdprintf; # arm x86 mips nobrillo
feof;
feof_unlocked;
ferror;
@ -447,7 +447,7 @@ LIBC {
fsync;
ftell;
ftello;
ftime; # arm x86 mips
ftime; # arm x86 mips nobrillo
ftok;
ftruncate;
ftruncate64;
@ -480,8 +480,8 @@ LIBC {
getchar_unlocked;
getcwd;
getdelim;
getdents; # arm x86 mips
getdtablesize; # arm x86 mips
getdents; # arm x86 mips nobrillo
getdtablesize; # arm x86 mips nobrillo
getegid;
getenv;
geteuid;
@ -556,7 +556,7 @@ LIBC {
if_nametoindex;
imaxabs;
imaxdiv;
index; # arm x86 mips
index; # arm x86 mips nobrillo
inet_addr;
inet_aton;
inet_lnaof;
@ -609,7 +609,7 @@ LIBC {
isprint_l;
ispunct;
ispunct_l;
issetugid; # arm x86 mips
issetugid; # arm x86 mips nobrillo
isspace;
isspace_l;
isupper;
@ -699,7 +699,7 @@ LIBC {
mempcpy;
memrchr;
memset;
memswap; # arm x86 mips
memswap; # arm x86 mips nobrillo
mincore;
mkdir;
mkdirat;
@ -790,7 +790,7 @@ LIBC {
pthread_attr_getschedpolicy;
pthread_attr_getscope;
pthread_attr_getstack;
pthread_attr_getstackaddr; # arm x86 mips
pthread_attr_getstackaddr; # arm x86 mips nobrillo
pthread_attr_getstacksize;
pthread_attr_init;
pthread_attr_setdetachstate;
@ -799,7 +799,7 @@ LIBC {
pthread_attr_setschedpolicy;
pthread_attr_setscope;
pthread_attr_setstack;
pthread_attr_setstackaddr; # arm x86 mips
pthread_attr_setstackaddr; # arm x86 mips nobrillo
pthread_attr_setstacksize;
pthread_cond_broadcast;
pthread_cond_destroy;
@ -1057,8 +1057,8 @@ LIBC {
strncpy;
strndup;
strnlen;
strntoimax; # arm x86 mips
strntoumax; # arm x86 mips
strntoimax; # arm x86 mips nobrillo
strntoumax; # arm x86 mips nobrillo
strpbrk;
strptime;
strrchr;
@ -1077,7 +1077,7 @@ LIBC {
strtoll;
strtoll_l;
strtoq;
strtotimeval; # arm x86 mips
strtotimeval; # arm x86 mips nobrillo
strtoul;
strtoull;
strtoull_l;
@ -1099,7 +1099,7 @@ LIBC {
sysinfo;
syslog;
system;
sysv_signal; # arm x86 mips
sysv_signal; # arm x86 mips nobrillo
tcdrain;
tcflow;
tcflush;
@ -1131,7 +1131,7 @@ LIBC {
timerfd_settime;
times;
timezone;
tkill; # arm x86 mips
tkill; # arm x86 mips nobrillo
tmpfile;
tmpnam;
toascii;
@ -1173,7 +1173,7 @@ LIBC {
vdprintf;
verr;
verrx;
vfdprintf; # arm x86 mips
vfdprintf; # arm x86 mips nobrillo
vfork;
vfprintf;
vfscanf;
@ -1193,7 +1193,7 @@ LIBC {
vwprintf;
vwscanf;
wait;
wait3; # arm x86 mips
wait3; # arm x86 mips nobrillo
wait4;
waitid;
waitpid;
@ -1242,7 +1242,7 @@ LIBC {
wcstoull;
wcstoull_l;
wcstoumax;
wcswcs; # arm x86 mips
wcswcs; # arm x86 mips nobrillo
wcswidth;
wcsxfrm;
wcsxfrm_l;
@ -1302,10 +1302,10 @@ LIBC_PRIVATE {
global:
__accept4; # arm x86 mips
__bionic_brk; # arm x86 mips
dlmalloc; # arm x86 mips
dlmalloc_inspect_all;
dlmalloc_trim;
dlmalloc_usable_size; # arm x86 mips
dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips
SHA1Init; # arm x86 mips

1185
libc/libc.mips64.brillo.map Normal file

File diff suppressed because it is too large Load Diff

View File

@ -241,7 +241,7 @@ LIBC {
dup3;
duplocale;
endmntent;
endpwent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent;
endutent;
environ;
@ -1182,7 +1182,7 @@ LIBC_N {
LIBC_PRIVATE {
global:
dlmalloc_inspect_all;
dlmalloc_trim;
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
gMallocLeakZygoteChild;
} LIBC_N;

1275
libc/libc.x86.brillo.map Normal file

File diff suppressed because it is too large Load Diff

View File

@ -38,12 +38,12 @@ LIBC {
__freadable;
__fsetlocking;
__fstatfs64; # arm x86 mips
__futex_wait; # arm x86 mips
__futex_wake; # arm x86 mips
__futex_wait; # arm x86 mips nobrillo
__futex_wake; # arm x86 mips nobrillo
__fwritable;
__get_h_errno;
__get_thread; # arm x86 mips
__get_tls; # arm x86 mips
__get_thread; # arm x86 mips nobrillo
__get_tls; # arm x86 mips nobrillo
__getcpu; # arm x86 mips
__getcwd; # arm x86 mips
__getdents64; # arm x86 mips
@ -101,7 +101,7 @@ LIBC {
__ns_skiprr; # arm x86 mips
__ns_sprintrr; # arm x86 mips
__ns_sprintrrf; # arm x86 mips
__open; # arm x86 mips
__open; # arm x86 mips nobrillo
__open_2;
__openat; # arm x86 mips
__openat_2;
@ -118,8 +118,8 @@ LIBC {
__p_time;
__p_type;
__p_type_syms;
__page_shift; # arm x86 mips
__page_size; # arm x86 mips
__page_shift; # arm x86 mips nobrillo
__page_size; # arm x86 mips nobrillo
__poll_chk;
__popcountsi2; # arm x86 mips
__ppoll; # arm x86 mips
@ -130,7 +130,7 @@ LIBC {
__pselect6; # arm x86 mips
__pthread_cleanup_pop;
__pthread_cleanup_push;
__pthread_gettid; # arm x86 mips
__pthread_gettid; # arm x86 mips nobrillo
__ptrace; # arm x86 mips
__putlong;
__putshort;
@ -170,8 +170,8 @@ LIBC {
__sched_cpufree;
__sched_getaffinity; # arm x86 mips
__sclose; # arm x86 mips
__sdidinit; # arm x86 mips
__set_errno; # arm x86 mips
__sdidinit; # arm x86 mips nobrillo
__set_errno; # arm x86 mips nobrillo
__set_thread_area; # x86
__set_tid_address; # arm x86 mips
__sF;
@ -181,7 +181,7 @@ LIBC {
__sglue; # arm x86 mips
__sigaction; # arm x86 mips
__signalfd4; # arm x86 mips
__sinit; # arm x86 mips
__sinit; # arm x86 mips nobrillo
__smakebuf; # arm x86 mips
__snprintf_chk;
__socket; # arm x86 mips
@ -237,7 +237,7 @@ LIBC {
__umoddi3; # x86 mips
__vsnprintf_chk;
__vsprintf_chk;
__wait4; # arm x86 mips
__wait4; # arm x86 mips nobrillo
__waitid; # arm x86 mips
_ctype_;
_Exit;
@ -270,9 +270,9 @@ LIBC {
android_gethostbynamefornet;
android_set_abort_message;
arc4random;
arc4random_addrandom; # arm x86 mips
arc4random_addrandom; # arm x86 mips nobrillo
arc4random_buf;
arc4random_stir; # arm x86 mips
arc4random_stir; # arm x86 mips nobrillo
arc4random_uniform;
asctime;
asctime64; # arm x86 mips
@ -286,11 +286,11 @@ LIBC {
atoll;
basename;
basename_r; # arm x86 mips
bcopy; # arm x86 mips
bcopy; # arm x86 mips nobrillo
bind;
bindresvport;
brk;
bsd_signal; # arm x86 mips
bsd_signal; # arm x86 mips nobrillo
bsearch;
btowc;
bzero; # arm x86 mips
@ -345,7 +345,7 @@ LIBC {
dup3;
duplocale;
endmntent;
endpwent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent;
endutent;
environ;
@ -392,7 +392,7 @@ LIBC {
fdatasync;
fdopen;
fdopendir;
fdprintf; # arm x86 mips
fdprintf; # arm x86 mips nobrillo
feof;
feof_unlocked;
ferror;
@ -445,7 +445,7 @@ LIBC {
fsync;
ftell;
ftello;
ftime; # arm x86 mips
ftime; # arm x86 mips nobrillo
ftok;
ftruncate;
ftruncate64;
@ -478,8 +478,8 @@ LIBC {
getchar_unlocked;
getcwd;
getdelim;
getdents; # arm x86 mips
getdtablesize; # arm x86 mips
getdents; # arm x86 mips nobrillo
getdtablesize; # arm x86 mips nobrillo
getegid;
getenv;
geteuid;
@ -554,7 +554,7 @@ LIBC {
if_nametoindex;
imaxabs;
imaxdiv;
index; # arm x86 mips
index; # arm x86 mips nobrillo
inet_addr;
inet_aton;
inet_lnaof;
@ -607,7 +607,7 @@ LIBC {
isprint_l;
ispunct;
ispunct_l;
issetugid; # arm x86 mips
issetugid; # arm x86 mips nobrillo
isspace;
isspace_l;
isupper;
@ -697,7 +697,7 @@ LIBC {
mempcpy;
memrchr;
memset;
memswap; # arm x86 mips
memswap; # arm x86 mips nobrillo
mincore;
mkdir;
mkdirat;
@ -788,7 +788,7 @@ LIBC {
pthread_attr_getschedpolicy;
pthread_attr_getscope;
pthread_attr_getstack;
pthread_attr_getstackaddr; # arm x86 mips
pthread_attr_getstackaddr; # arm x86 mips nobrillo
pthread_attr_getstacksize;
pthread_attr_init;
pthread_attr_setdetachstate;
@ -797,7 +797,7 @@ LIBC {
pthread_attr_setschedpolicy;
pthread_attr_setscope;
pthread_attr_setstack;
pthread_attr_setstackaddr; # arm x86 mips
pthread_attr_setstackaddr; # arm x86 mips nobrillo
pthread_attr_setstacksize;
pthread_cond_broadcast;
pthread_cond_destroy;
@ -1055,8 +1055,8 @@ LIBC {
strncpy;
strndup;
strnlen;
strntoimax; # arm x86 mips
strntoumax; # arm x86 mips
strntoimax; # arm x86 mips nobrillo
strntoumax; # arm x86 mips nobrillo
strpbrk;
strptime;
strrchr;
@ -1075,7 +1075,7 @@ LIBC {
strtoll;
strtoll_l;
strtoq;
strtotimeval; # arm x86 mips
strtotimeval; # arm x86 mips nobrillo
strtoul;
strtoull;
strtoull_l;
@ -1097,7 +1097,7 @@ LIBC {
sysinfo;
syslog;
system;
sysv_signal; # arm x86 mips
sysv_signal; # arm x86 mips nobrillo
tcdrain;
tcflow;
tcflush;
@ -1129,7 +1129,7 @@ LIBC {
timerfd_settime;
times;
timezone;
tkill; # arm x86 mips
tkill; # arm x86 mips nobrillo
tmpfile;
tmpnam;
toascii;
@ -1171,7 +1171,7 @@ LIBC {
vdprintf;
verr;
verrx;
vfdprintf; # arm x86 mips
vfdprintf; # arm x86 mips nobrillo
vfork;
vfprintf;
vfscanf;
@ -1191,7 +1191,7 @@ LIBC {
vwprintf;
vwscanf;
wait;
wait3; # arm x86 mips
wait3; # arm x86 mips nobrillo
wait4;
waitid;
waitpid;
@ -1240,7 +1240,7 @@ LIBC {
wcstoull;
wcstoull_l;
wcstoumax;
wcswcs; # arm x86 mips
wcswcs; # arm x86 mips nobrillo
wcswidth;
wcsxfrm;
wcsxfrm_l;
@ -1301,10 +1301,10 @@ LIBC_PRIVATE {
__accept4; # arm x86 mips
__bionic_brk; # arm x86 mips
__bionic_libgcc_compat_symbols; # arm x86
dlmalloc; # arm x86 mips
dlmalloc_inspect_all;
dlmalloc_trim;
dlmalloc_usable_size; # arm x86 mips
dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips
SHA1Init; # arm x86 mips

1185
libc/libc.x86_64.brillo.map Normal file

File diff suppressed because it is too large Load Diff

View File

@ -241,7 +241,7 @@ LIBC {
dup3;
duplocale;
endmntent;
endpwent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent;
endutent;
environ;
@ -1182,7 +1182,7 @@ LIBC_N {
LIBC_PRIVATE {
global:
dlmalloc_inspect_all;
dlmalloc_trim;
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
gMallocLeakZygoteChild;
} LIBC_N;

View File

@ -36,20 +36,26 @@ class VersionScriptGenerator(object):
basename = os.path.basename(script)
dirname = os.path.dirname(script)
for arch in all_arches:
name = basename.split(".")[0] + "." + arch + ".map"
tmp_path = os.path.join(bionic_temp, name)
dest_path = os.path.join(dirname, name)
with open(tmp_path, "w") as fout:
with open(script, "r") as fin:
fout.write("# %s\n" % warning)
for line in fin:
index = line.find("#")
if index != -1:
arches = line[index+1:].split()
if arch not in arches:
continue
fout.write(line)
shutil.copyfile(tmp_path, dest_path)
for brillo in [False, True]:
has_nobrillo = False
name = basename.split(".")[0] + "." + arch + (".brillo" if brillo else "") + ".map"
tmp_path = os.path.join(bionic_temp, name)
dest_path = os.path.join(dirname, name)
with open(tmp_path, "w") as fout:
with open(script, "r") as fin:
fout.write("# %s\n" % warning)
for line in fin:
index = line.find("#")
if index != -1:
tags = line[index+1:].split()
if arch not in tags:
continue
if brillo and "nobrillo" in tags:
has_nobrillo = True
continue
fout.write(line)
if not brillo or has_nobrillo:
shutil.copyfile(tmp_path, dest_path)
generator = VersionScriptGenerator()