am 5853cce9: am 97c9b03f: am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"

* commit '5853cce9d0a28ff4ee64909af86dc40e1639e9b8':
  ndk: x86: Update android-9 x86 platform files

23 files changed, 30 insertions, 35 deletions

diff --git a/ndk/platforms/android-9/arch-x86/lib/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-x86/lib/crtbegin_dynamic.o
index 102fc37bd..17704f55b 100644
--- a/ndk/platforms/android-9/arch-x86/lib/crtbegin_dynamic.o
+++ b/ndk/platforms/android-9/arch-x86/lib/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/crtbegin_so.o b/ndk/platforms/android-9/arch-x86/lib/crtbegin_so.o
index 662d85aad..cf50f1de8 100644
--- a/ndk/platforms/android-9/arch-x86/lib/crtbegin_so.o
+++ b/ndk/platforms/android-9/arch-x86/lib/crtbegin_so.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/crtbegin_static.o b/ndk/platforms/android-9/arch-x86/lib/crtbegin_static.o
index 102fc37bd..17704f55b 100644
--- a/ndk/platforms/android-9/arch-x86/lib/crtbegin_static.o
+++ b/ndk/platforms/android-9/arch-x86/lib/crtbegin_static.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/libEGL.so b/ndk/platforms/android-9/arch-x86/lib/libEGL.so
index 6a8277ed0..49020a985 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libEGL.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libEGL.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libGLESv1_CM.so b/ndk/platforms/android-9/arch-x86/lib/libGLESv1_CM.so
index d03d357f4..83ddd59c5 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libGLESv1_CM.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libGLESv1_CM.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libGLESv2.so b/ndk/platforms/android-9/arch-x86/lib/libGLESv2.so
index 51d6b5954..7c725673b 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libGLESv2.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libGLESv2.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libOpenSLES.so b/ndk/platforms/android-9/arch-x86/lib/libOpenSLES.so
index 110da004e..de81e576d 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libOpenSLES.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libOpenSLES.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libandroid.so b/ndk/platforms/android-9/arch-x86/lib/libandroid.so
index e1064369a..419d414f2 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libandroid.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libandroid.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libc.a b/ndk/platforms/android-9/arch-x86/lib/libc.a
index e47736fad..90220b052 100644
--- a/ndk/platforms/android-9/arch-x86/lib/libc.a
+++ b/ndk/platforms/android-9/arch-x86/lib/libc.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libc.so b/ndk/platforms/android-9/arch-x86/lib/libc.so
index bf23ca564..fd6c18884 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libc.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libc.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libdl.so b/ndk/platforms/android-9/arch-x86/lib/libdl.so
index 2c1318748..c31fd46f1 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libdl.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libdl.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libjnigraphics.so b/ndk/platforms/android-9/arch-x86/lib/libjnigraphics.so
index c66995710..2a0494f22 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libjnigraphics.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libjnigraphics.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/liblog.so b/ndk/platforms/android-9/arch-x86/lib/liblog.so
index f28bf77b6..6ab1fd299 100755
--- a/ndk/platforms/android-9/arch-x86/lib/liblog.so
+++ b/ndk/platforms/android-9/arch-x86/lib/liblog.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libm.a b/ndk/platforms/android-9/arch-x86/lib/libm.a
index 092b2cce4..34f3c1f6d 100644
--- a/ndk/platforms/android-9/arch-x86/lib/libm.a
+++ b/ndk/platforms/android-9/arch-x86/lib/libm.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libm.so b/ndk/platforms/android-9/arch-x86/lib/libm.so
index ce9ffea70..78c3def5b 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libm.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libm.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libstdc++.a b/ndk/platforms/android-9/arch-x86/lib/libstdc++.a
index 04788e0ce..336bcfab8 100644
--- a/ndk/platforms/android-9/arch-x86/lib/libstdc++.a
+++ b/ndk/platforms/android-9/arch-x86/lib/libstdc++.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libstdc++.so b/ndk/platforms/android-9/arch-x86/lib/libstdc++.so
index 4ddac651a..248dc4827 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libstdc++.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libstdc++.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libthread_db.a b/ndk/platforms/android-9/arch-x86/lib/libthread_db.a
index de2e34db6..9525ff16e 100644
--- a/ndk/platforms/android-9/arch-x86/lib/libthread_db.a
+++ b/ndk/platforms/android-9/arch-x86/lib/libthread_db.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libz.a b/ndk/platforms/android-9/arch-x86/lib/libz.a
index 1df2ec38d..5c91867c7 100644
--- a/ndk/platforms/android-9/arch-x86/lib/libz.a
+++ b/ndk/platforms/android-9/arch-x86/lib/libz.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libz.so b/ndk/platforms/android-9/arch-x86/lib/libz.so
index 9155cb992..384e8c4b6 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libz.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libz.so
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libEGL.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libEGL.so.txt
index 88d4105ae..85503354c 100644
--- a/ndk/platforms/android-9/arch-x86/symbols/libEGL.so.txt
+++ b/ndk/platforms/android-9/arch-x86/symbols/libEGL.so.txt
@@ -1,19 +1,16 @@
 eglBindAPI
 eglBindTexImage
 eglChooseConfig
-eglClientWaitSyncKHR
 eglCopyBuffers
 eglCreateContext
 eglCreateImageKHR
 eglCreatePbufferFromClientBuffer
 eglCreatePbufferSurface
 eglCreatePixmapSurface
-eglCreateSyncKHR
 eglCreateWindowSurface
 eglDestroyContext
 eglDestroyImageKHR
 eglDestroySurface
-eglDestroySyncKHR
 eglGetConfigAttrib
 eglGetConfigs
 eglGetCurrentContext
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libc.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libc.so.txt
index 39d905ef7..6479e95bb 100644
--- a/ndk/platforms/android-9/arch-x86/symbols/libc.so.txt
+++ b/ndk/platforms/android-9/arch-x86/symbols/libc.so.txt
@@ -11,9 +11,6 @@ __assert2
 __atexit_register_cleanup
 __b64_ntop
 __b64_pton
-__bionic_atfork_run_child
-__bionic_atfork_run_parent
-__bionic_atfork_run_prepare
 __brk
 __cxa_atexit
 __cxa_finalize
@@ -22,6 +19,7 @@ __dn_comp
 __dn_count_labels
 __dn_skipname
 __dorand48
+__dtoa
 __errno
 __evAddTime
 __evCmpTime
@@ -38,6 +36,7 @@ __findenv
 __fork
 __fp_nquery
 __fp_query
+__fremovelock
 __fstatfs64
 __futex_syscall3
 __futex_syscall4
@@ -51,7 +50,6 @@ __get_sp
 __get_stack_base
 __get_thread
 __get_tls
-__getcpu
 __getcwd
 __getpriority
 __hostalias
@@ -106,7 +104,7 @@ __p_section
 __p_sockun
 __p_time
 __p_type
-__popcountsi2
+__pread64
 __pthread_cleanup_pop
 __pthread_cleanup_push
 __pthread_clone
@@ -115,6 +113,7 @@ __pthread_cond_timedwait_relative
 __ptrace
 __putlong
 __putshort
+__pwrite64
 __reboot
 __res_close
 __res_dnok
@@ -140,6 +139,7 @@ __res_nquerydomain
 __res_nsearch
 __res_nsend
 __res_opt
+__res_ourserver_p
 __res_ownok
 __res_pquery
 __res_put_state
@@ -154,12 +154,9 @@ __res_vinit
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
-__sched_cpualloc
-__sched_cpucount
-__sched_cpufree
-__sched_getaffinity
 __sclose
 __set_errno
+__set_syscall_errno
 __set_thread_area
 __set_tls
 __setresuid
@@ -168,8 +165,10 @@ __setuid
 __sflags
 __sflush
 __sfp
+__sfvwrite
 __sigsuspend
 __sinit
+__slbexpand
 __smakebuf
 __sread
 __srefill
@@ -198,19 +197,28 @@ __timer_delete
 __timer_getoverrun
 __timer_gettime
 __timer_settime
+__timer_table_start_stop
 __udivdi3
 __umoddi3
 __wait4
 __waitid
 _cleanup
+_dorand48
+_endhtent
 _exit
 _exit_thread
 _exit_with_stack_teardown
 _fwalk
+_gethtbyaddr
+_gethtbyname
+_gethtbyname2
+_gethtent
 _getlong
 _getshort
 _init_thread
 _longjmp
+_mktemp
+_sethtent
 _setjmp
 _thread_created_hook
 _waitpid
@@ -230,7 +238,6 @@ asctime64
 asctime64_r
 asctime_r
 asprintf
-atexit
 atoi
 atol
 atoll
@@ -263,6 +270,8 @@ closedir
 closelog
 closelog_r
 connect
+copy_TM_to_tm
+copy_tm_to_TM
 cpuacct_add
 creat
 ctime
@@ -308,10 +317,6 @@ epoll_wait
 erand48
 err
 errx
-ether_aton
-ether_aton_r
-ether_ntoa
-ether_ntoa_r
 eventfd
 eventfd_read
 eventfd_write
@@ -373,7 +378,6 @@ ftello
 ftime
 ftok
 ftruncate
-ftruncate64
 ftrylockfile
 fts_children
 fts_close
@@ -575,13 +579,10 @@ pipe
 pipe2
 poll
 popen
-posix2time
 prctl
 pread
-pread64
 printf
 pselect
-pthread_atfork
 pthread_attr_destroy
 pthread_attr_getdetachstate
 pthread_attr_getguardsize
@@ -671,7 +672,6 @@ putw
 putwc
 putwchar
 pwrite
-pwrite64
 qsort
 raise
 read
@@ -694,6 +694,7 @@ rename
 renameat
 res_init
 res_mkquery
+res_need_init
 res_query
 res_search
 rewind
@@ -704,12 +705,9 @@ scandir
 scanf
 sched_get_priority_max
 sched_get_priority_min
-sched_getaffinity
-sched_getcpu
 sched_getparam
 sched_getscheduler
 sched_rr_get_interval
-sched_setaffinity
 sched_setparam
 sched_setscheduler
 sched_yield
@@ -763,10 +761,8 @@ sigaction
 sigaltstack
 sigblock
 siginterrupt
-siglongjmp
 sigpending
 sigprocmask
-sigsetjmp
 sigsetmask
 sigsuspend
 sigwait
@@ -836,10 +832,7 @@ tcgetpgrp
 tcsetpgrp
 tempnam
 time
-time2posix
-timegm
 timegm64
-timelocal
 timelocal64
 timer_create
 timer_delete
@@ -873,6 +866,8 @@ usleep
 utime
 utimes
 utmpname
+valid_tm_mon
+valid_tm_wday
 valloc
 vasprintf
 verr
@@ -958,23 +953,30 @@ __libc_malloc_default_dispatch
 __libc_malloc_dispatch
 __p_cert_syms
 __p_class_syms
+__p_default_section_syms
 __p_key_syms
 __p_rcode_syms
 __p_type_syms
+__p_update_section_syms
 __page_shift
 __page_size
-__popcount_tab
 __progname
 __rand48_add
 __rand48_mult
 __rand48_seed
 __sF
+__sFext
 __sdidinit
 __sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
+_nres
 _ns_flagdata
+_rand48_add
+_rand48_mult
+_rand48_seed
+_res_opcodes
 _tolower_tab_
 _toupper_tab_
 daylight
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libm.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libm.so.txt
index 1552b5d69..349f00fe9 100644
--- a/ndk/platforms/android-9/arch-x86/symbols/libm.so.txt
+++ b/ndk/platforms/android-9/arch-x86/symbols/libm.so.txt
@@ -28,7 +28,6 @@ __signbit
 __signbitf
 __signbitl
 __test_sse
-_scan_nan
 acos
 acosf
 acosh
@@ -138,8 +137,6 @@ lroundf
 lroundl
 modf
 modff
-nan
-nanf
 nearbyint
 nearbyintf
 nextafter
@@ -177,7 +174,6 @@ tanf
 tanh
 tanhf
 tgamma
-tgammaf
 trunc
 truncf
 truncl