From 64c835fdb708a67cc59f95c6b42087b78d0fc449 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Thu, 17 Dec 2015 15:29:58 -0800 Subject: [PATCH 1/3] Remove LIBC_PRIVATE symbols from android-18 libc Bug: http://b/26234924 Change-Id: I7c42aa37eb5ed59082a4a5cb7ad57c4761e93543 --- .../arch-arm/symbols/libc.so.functions.txt | 105 ------------------ .../arch-arm/symbols/libc.so.variables.txt | 1 - .../arch-mips/symbols/libc.so.functions.txt | 8 -- .../arch-mips/symbols/libc.so.variables.txt | 1 - .../arch-x86/symbols/libc.so.functions.txt | 7 -- .../arch-x86/symbols/libc.so.variables.txt | 1 - 6 files changed, 123 deletions(-) diff --git a/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt index 3ebc908ae..a05aae654 100644 --- a/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt @@ -1,89 +1,6 @@ MD5_Final MD5_Init MD5_Update -SHA1Final -SHA1Init -SHA1Transform -SHA1Update -_Unwind_Backtrace -_Unwind_Complete -_Unwind_DeleteException -_Unwind_ForcedUnwind -_Unwind_GetCFA -_Unwind_GetDataRelBase -_Unwind_GetLanguageSpecificData -_Unwind_GetRegionStart -_Unwind_GetTextRelBase -_Unwind_RaiseException -_Unwind_Resume -_Unwind_Resume_or_Rethrow -_Unwind_VRS_Get -_Unwind_VRS_Pop -_Unwind_VRS_Set -___Unwind_Backtrace -___Unwind_ForcedUnwind -___Unwind_RaiseException -___Unwind_Resume -___Unwind_Resume_or_Rethrow -__adddf3 -__addsf3 -__aeabi_atexit -__aeabi_cdcmpeq -__aeabi_cdcmple -__aeabi_cdrcmple -__aeabi_d2f -__aeabi_d2iz -__aeabi_dadd -__aeabi_dcmpeq -__aeabi_dcmpge -__aeabi_dcmpgt -__aeabi_dcmple -__aeabi_dcmplt -__aeabi_dcmpun -__aeabi_ddiv -__aeabi_dmul -__aeabi_drsub -__aeabi_dsub -__aeabi_f2d -__aeabi_f2iz -__aeabi_fadd -__aeabi_fcmpun -__aeabi_fdiv -__aeabi_fmul -__aeabi_frsub -__aeabi_fsub -__aeabi_i2d -__aeabi_i2f -__aeabi_idiv -__aeabi_idiv0 -__aeabi_idivmod -__aeabi_l2d -__aeabi_l2f -__aeabi_ldiv0 -__aeabi_ldivmod -__aeabi_lmul -__aeabi_memclr -__aeabi_memclr4 -__aeabi_memclr8 -__aeabi_memcpy -__aeabi_memcpy4 -__aeabi_memcpy8 -__aeabi_memmove -__aeabi_memmove4 -__aeabi_memmove8 -__aeabi_memset -__aeabi_memset4 -__aeabi_memset8 -__aeabi_ui2d -__aeabi_ui2f -__aeabi_uidiv -__aeabi_uidivmod -__aeabi_ul2d -__aeabi_ul2f -__aeabi_uldivmod -__aeabi_unwind_cpp_pr0 -__aeabi_unwind_cpp_pr1 -__aeabi_unwind_cpp_pr2 __arc4_getbyte __assert __assert2 @@ -152,26 +69,8 @@ __get_stack_base __get_thread __getcwd __getpriority -__gnu_Unwind_Backtrace -__gnu_Unwind_Find_exidx -__gnu_Unwind_ForcedUnwind -__gnu_Unwind_RaiseException -__gnu_Unwind_Restore_VFP -__gnu_Unwind_Restore_VFP_D -__gnu_Unwind_Restore_VFP_D_16_to_31 -__gnu_Unwind_Restore_WMMXC -__gnu_Unwind_Restore_WMMXD -__gnu_Unwind_Resume -__gnu_Unwind_Resume_or_Rethrow -__gnu_Unwind_Save_VFP -__gnu_Unwind_Save_VFP_D -__gnu_Unwind_Save_VFP_D_16_to_31 -__gnu_Unwind_Save_WMMXC -__gnu_Unwind_Save_WMMXD __gnu_ldivmod_helper __gnu_uldivmod_helper -__gnu_unwind_execute -__gnu_unwind_frame __gtdf2 __hostalias __init_tls @@ -350,7 +249,6 @@ asctime64 asctime64_r asctime_r asprintf -atexit atoi atol atoll @@ -403,12 +301,9 @@ dlfree dlindependent_calloc dlindependent_comalloc dlmallinfo -dlmalloc dlmalloc_footprint dlmalloc_max_footprint dlmalloc_stats -dlmalloc_trim -dlmalloc_usable_size dlmallopt dlmemalign dlpvalloc diff --git a/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt b/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt index 5fc19bcdc..2b3a4765c 100644 --- a/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt +++ b/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt @@ -3,7 +3,6 @@ _C_tolower_ _C_toupper_ __atexit __atexit_invalid -__bionic_brk __isthreaded __libc_malloc_default_dispatch __libc_malloc_dispatch diff --git a/ndk/platforms/android-18/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-18/arch-mips/symbols/libc.so.functions.txt index 367350fd8..886d61497 100644 --- a/ndk/platforms/android-18/arch-mips/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-18/arch-mips/symbols/libc.so.functions.txt @@ -1,10 +1,6 @@ MD5_Final MD5_Init MD5_Update -SHA1Final -SHA1Init -SHA1Transform -SHA1Update __arc4_getbyte __assert __assert2 @@ -219,7 +215,6 @@ asctime64 asctime64_r asctime_r asprintf -atexit atoi atol atoll @@ -272,12 +267,9 @@ dlfree dlindependent_calloc dlindependent_comalloc dlmallinfo -dlmalloc dlmalloc_footprint dlmalloc_max_footprint dlmalloc_stats -dlmalloc_trim -dlmalloc_usable_size dlmallopt dlmemalign dlpvalloc diff --git a/ndk/platforms/android-18/arch-mips/symbols/libc.so.variables.txt b/ndk/platforms/android-18/arch-mips/symbols/libc.so.variables.txt index 5fc19bcdc..2b3a4765c 100644 --- a/ndk/platforms/android-18/arch-mips/symbols/libc.so.variables.txt +++ b/ndk/platforms/android-18/arch-mips/symbols/libc.so.variables.txt @@ -3,7 +3,6 @@ _C_tolower_ _C_toupper_ __atexit __atexit_invalid -__bionic_brk __isthreaded __libc_malloc_default_dispatch __libc_malloc_dispatch diff --git a/ndk/platforms/android-18/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-18/arch-x86/symbols/libc.so.functions.txt index 74dd9b4e5..a730ec7d8 100644 --- a/ndk/platforms/android-18/arch-x86/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-18/arch-x86/symbols/libc.so.functions.txt @@ -1,10 +1,6 @@ MD5_Final MD5_Init MD5_Update -SHA1Final -SHA1Init -SHA1Transform -SHA1Update __arc4_getbyte __assert __assert2 @@ -267,12 +263,9 @@ dlfree dlindependent_calloc dlindependent_comalloc dlmallinfo -dlmalloc dlmalloc_footprint dlmalloc_max_footprint dlmalloc_stats -dlmalloc_trim -dlmalloc_usable_size dlmallopt dlmemalign dlpvalloc diff --git a/ndk/platforms/android-18/arch-x86/symbols/libc.so.variables.txt b/ndk/platforms/android-18/arch-x86/symbols/libc.so.variables.txt index 5fc19bcdc..2b3a4765c 100644 --- a/ndk/platforms/android-18/arch-x86/symbols/libc.so.variables.txt +++ b/ndk/platforms/android-18/arch-x86/symbols/libc.so.variables.txt @@ -3,7 +3,6 @@ _C_tolower_ _C_toupper_ __atexit __atexit_invalid -__bionic_brk __isthreaded __libc_malloc_default_dispatch __libc_malloc_dispatch From 86f95e8475e538597ea2e6cf061961be9662010e Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Thu, 17 Dec 2015 15:31:35 -0800 Subject: [PATCH 2/3] Remove LIBC_PRIVATE symbols from android-18 libm Bug: http://b/26234924 Change-Id: Ic5688a2c867aebfbfb67cbfef60099d1a72b302f --- .../arch-arm/symbols/libm.so.functions.txt | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/ndk/platforms/android-18/arch-arm/symbols/libm.so.functions.txt b/ndk/platforms/android-18/arch-arm/symbols/libm.so.functions.txt index 7701917a1..a6871a615 100644 --- a/ndk/platforms/android-18/arch-arm/symbols/libm.so.functions.txt +++ b/ndk/platforms/android-18/arch-arm/symbols/libm.so.functions.txt @@ -1,20 +1,7 @@ __addsf3 -__aeabi_cfcmpeq -__aeabi_cfcmple -__aeabi_cfrcmple -__aeabi_d2lz -__aeabi_d2uiz -__aeabi_d2ulz __aeabi_dcmpun __aeabi_f2iz -__aeabi_f2lz -__aeabi_f2ulz __aeabi_fadd -__aeabi_fcmpeq -__aeabi_fcmpge -__aeabi_fcmpgt -__aeabi_fcmple -__aeabi_fcmplt __aeabi_fcmpun __aeabi_fdiv __aeabi_fmul @@ -24,16 +11,9 @@ __aeabi_i2f __aeabi_l2f __aeabi_ui2f __aeabi_ul2f -__cmpsf2 __divsf3 -__eqsf2 __exp__D -__fixdfdi -__fixsfdi __fixsfsi -__fixunsdfdi -__fixunsdfsi -__fixunssfdi __floatdisf __floatsisf __floatundisf @@ -41,8 +21,6 @@ __floatunsisf __fpclassifyd __fpclassifyf __fpclassifyl -__gesf2 -__gtsf2 __ieee754_rem_pio2 __ieee754_rem_pio2f __isfinite @@ -62,11 +40,8 @@ __kernel_sin __kernel_sindf __kernel_tan __kernel_tandf -__lesf2 __log__D -__ltsf2 __mulsf3 -__nesf2 __signbit __signbitf __signbitl From cfd35aa9347c3f153ac7353b5f2e9ece278ee046 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Thu, 17 Dec 2015 15:47:05 -0800 Subject: [PATCH 3/3] Remove android-18/arm symbols not present in platform libc Bug: http://b/26236057 Change-Id: Icb5ba2a5b7e1a9b81aee4b388ec3601c3f2ad434 --- .../arch-arm/symbols/libc.so.functions.txt | 97 ------------------- .../arch-arm/symbols/libc.so.variables.txt | 16 --- 2 files changed, 113 deletions(-) diff --git a/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt index a05aae654..761d7cda8 100644 --- a/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt @@ -1,24 +1,15 @@ -MD5_Final -MD5_Init -MD5_Update -__arc4_getbyte __assert __assert2 -__atexit_register_cleanup __atomic_cmpxchg __atomic_dec __atomic_inc __atomic_swap __b64_ntop __b64_pton -__bionic_clone -__bionic_clone_entry -__bionic_libgcc_compat_hooks __brk __cmpdf2 __cxa_atexit __cxa_finalize -__div0 __divdf3 __divdi3 __divsf3 @@ -26,22 +17,10 @@ __divsi3 __dn_comp __dn_count_labels __dn_skipname -__dorand48 __eqdf2 __errno -__evAddTime -__evCmpTime -__evConsIovec -__evConsTime -__evNowTime -__evSubTime -__evTimeSpec -__evTimeVal -__evUTCTime __extendsfdf2 -__fcntl __fcntl64 -__findenv __fixdfsi __fixsfsi __floatdidf @@ -52,20 +31,13 @@ __floatundidf __floatundisf __floatunsidf __floatunsisf -__fork __fp_nquery __fp_query __fstatfs64 -__futex_syscall3 -__futex_syscall4 __futex_wait -__futex_wait_ex __futex_wake -__futex_wake_ex __gedf2 __get_h_errno -__get_sp -__get_stack_base __get_thread __getcwd __getpriority @@ -73,16 +45,13 @@ __gnu_ldivmod_helper __gnu_uldivmod_helper __gtdf2 __hostalias -__init_tls __ioctl __ledf2 -__libc_fini __libc_init __llseek __loc_aton __loc_ntoa __ltdf2 -__memcmp16 __mmap2 __muldf3 __muldi3 @@ -121,69 +90,44 @@ __p_option __p_query __p_rcode __p_secstodate -__p_section -__p_sockun __p_time __p_type __pthread_cleanup_pop __pthread_cleanup_push -__pthread_clone -__pthread_cond_timedwait -__pthread_cond_timedwait_relative __ptrace __putlong __putshort __reboot __res_close __res_dnok -__res_get_nibblesuffix -__res_get_nibblesuffix2 -__res_get_state -__res_get_static -__res_getservers __res_hnok __res_hostalias __res_isourserver __res_mailok __res_nameinquery -__res_nametoclass -__res_nametotype __res_nclose -__res_ndestroy __res_ninit __res_nmkquery -__res_nopt __res_nquery __res_nquerydomain __res_nsearch __res_nsend -__res_opt __res_ownok -__res_pquery -__res_put_state __res_queriesmatch __res_querydomain -__res_randomid __res_send __res_send_setqhook __res_send_setrhook -__res_setservers -__res_vinit __restore_core_regs __rt_sigaction __rt_sigprocmask __rt_sigtimedwait __sclose __set_tls -__setresuid -__setreuid -__setuid __sflags __sflush __sfp -__sigsuspend __sinit -__slbexpand __smakebuf __sread __srefill @@ -194,21 +138,16 @@ __statfs64 __subdf3 __subsf3 __swbuf -__swhatbuf __swrite __swsetup __sym_ntop __sym_ntos __sym_ston -__sys_clone -__syslog __system_properties_init __system_property_find __system_property_find_nth __system_property_get __system_property_read -__system_property_wait -__thread_entry __timer_create __timer_delete __timer_getoverrun @@ -221,18 +160,12 @@ __unorddf2 __unordsf2 __wait4 __waitid -_cleanup -_dorand48 _exit -_exit_thread -_exit_with_stack_teardown _fwalk _getlong _getshort -_init_thread _longjmp _setjmp -_thread_created_hook abort accept access @@ -281,9 +214,7 @@ clone close closedir closelog -closelog_r connect -cpuacct_add creat ctime ctime64 @@ -296,26 +227,12 @@ dirfd dirname dirname_r div -dlcalloc -dlfree -dlindependent_calloc -dlindependent_comalloc -dlmallinfo -dlmalloc_footprint -dlmalloc_max_footprint -dlmalloc_stats -dlmallopt -dlmemalign -dlpvalloc -dlrealloc -dlvalloc dn_expand drand48 dup dup2 endpwent endservent -endusershell endutent epoll_create epoll_ctl @@ -370,7 +287,6 @@ fputws fread free freeaddrinfo -freedtoa freopen fscanf fseek @@ -394,7 +310,6 @@ fts_read fts_set funlockfile funopen -futex fwide fwprintf fwrite @@ -451,13 +366,11 @@ gets getservbyname getservbyport getservent -getservent_r getsockname getsockopt gettid gettimeofday getuid -getusershell getutent getwc getwchar @@ -483,8 +396,6 @@ inotify_add_watch inotify_init inotify_rm_watch ioctl -ioprio_get -ioprio_set isalnum isalpha isascii @@ -527,7 +438,6 @@ localtime64 localtime64_r localtime_r longjmp -longjmperror lrand48 lseek lseek64 @@ -535,7 +445,6 @@ lstat madvise mallinfo malloc -malloc_debug_init mbrlen mbrtowc mbsinit @@ -578,7 +487,6 @@ open openat opendir openlog -openlog_r pathconf pause pclose @@ -750,7 +658,6 @@ setjmp setlinebuf setlocale setlogmask -setlogmask_r setpgid setpgrp setpriority @@ -764,7 +671,6 @@ setsid setsockopt settimeofday setuid -setusershell setutent setvbuf shutdown @@ -800,7 +706,6 @@ strdup strerror strerror_r strftime -strftime_tz strlcat strlcpy strlen @@ -838,7 +743,6 @@ syscall sysconf sysinfo syslog -syslog_r system sysv_signal tcgetpgrp @@ -896,7 +800,6 @@ vsprintf vsscanf vswprintf vsyslog -vsyslog_r vwarn vwarnx vwprintf diff --git a/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt b/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt index 2b3a4765c..ce6a5bb37 100644 --- a/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt +++ b/ndk/platforms/android-18/arch-arm/symbols/libc.so.variables.txt @@ -1,35 +1,19 @@ -_C_ctype_ -_C_tolower_ -_C_toupper_ -__atexit -__atexit_invalid __isthreaded -__libc_malloc_default_dispatch -__libc_malloc_dispatch -__p_cert_syms __p_class_syms -__p_key_syms -__p_rcode_syms __p_type_syms __page_shift __page_size __progname -__rand48_add -__rand48_mult -__rand48_seed __sF __sdidinit __sglue __stack_chk_guard __system_property_area__ _ctype_ -_ns_flagdata _tolower_tab_ _toupper_tab_ daylight environ -h_errlist -h_nerr optarg opterr optind