diff --git a/ndk/platforms/android-L/arch-arm/lib/libc.a b/ndk/platforms/android-L/arch-arm/lib/libc.a index eff877258..fb3ee8cdf 100644 Binary files a/ndk/platforms/android-L/arch-arm/lib/libc.a and b/ndk/platforms/android-L/arch-arm/lib/libc.a differ diff --git a/ndk/platforms/android-L/arch-arm/lib/libstdc++.a b/ndk/platforms/android-L/arch-arm/lib/libstdc++.a index fabf7bb1a..698f3d61e 100644 Binary files a/ndk/platforms/android-L/arch-arm/lib/libstdc++.a and b/ndk/platforms/android-L/arch-arm/lib/libstdc++.a differ diff --git a/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt index 83a51eef5..578a08072 100644 --- a/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt @@ -91,6 +91,7 @@ __aeabi_uldivmod __aeabi_unwind_cpp_pr0 __aeabi_unwind_cpp_pr1 __aeabi_unwind_cpp_pr2 +__arm_fadvise64_64 __ashldi3 __ashrdi3 __assert @@ -144,6 +145,7 @@ __futex_wait __futex_wake __gedf2 __get_h_errno +__get_thread __get_tls __getcpu __getcwd @@ -260,6 +262,7 @@ __sched_cpualloc __sched_cpucount __sched_cpufree __sched_getaffinity +__set_errno __set_tid_address __set_tls __sigaction @@ -286,6 +289,7 @@ __strrchr_chk __subdf3 __subsf3 __swbuf +__swsetup __sym_ntop __sym_ntos __sym_ston @@ -341,6 +345,7 @@ android_gethostbyaddrfornet android_gethostbynamefornet android_set_abort_message arc4random +arc4random_addrandom arc4random_buf arc4random_stir arc4random_uniform @@ -406,6 +411,7 @@ dirfd dirname dirname_r div +dlmalloc_usable_size dn_expand dprintf drand48 @@ -796,6 +802,8 @@ pipe pipe2 poll popen +posix_fadvise +posix_fadvise64 posix_fallocate posix_fallocate64 posix_memalign @@ -852,6 +860,7 @@ pthread_getattr_np pthread_getcpuclockid pthread_getschedparam pthread_getspecific +pthread_gettid_np pthread_join pthread_key_create pthread_key_delete diff --git a/ndk/platforms/android-L/arch-arm64/lib/libc.a b/ndk/platforms/android-L/arch-arm64/lib/libc.a index febe52c2e..4e8c6efc4 100644 Binary files a/ndk/platforms/android-L/arch-arm64/lib/libc.a and b/ndk/platforms/android-L/arch-arm64/lib/libc.a differ diff --git a/ndk/platforms/android-L/arch-arm64/lib/libstdc++.a b/ndk/platforms/android-L/arch-arm64/lib/libstdc++.a index d2e3b3443..99b485666 100644 Binary files a/ndk/platforms/android-L/arch-arm64/lib/libstdc++.a and b/ndk/platforms/android-L/arch-arm64/lib/libstdc++.a differ diff --git a/ndk/platforms/android-L/arch-arm64/lib/libz.a b/ndk/platforms/android-L/arch-arm64/lib/libz.a index 89846b1e9..e96c72134 100644 Binary files a/ndk/platforms/android-L/arch-arm64/lib/libz.a and b/ndk/platforms/android-L/arch-arm64/lib/libz.a differ diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt index c0c86a525..7dddb2a4a 100644 --- a/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt @@ -578,6 +578,8 @@ pipe pipe2 poll popen +posix_fadvise +posix_fadvise64 posix_fallocate posix_fallocate64 posix_memalign @@ -629,6 +631,7 @@ pthread_getattr_np pthread_getcpuclockid pthread_getschedparam pthread_getspecific +pthread_gettid_np pthread_join pthread_key_create pthread_key_delete diff --git a/ndk/platforms/android-L/arch-mips/lib/libc.a b/ndk/platforms/android-L/arch-mips/lib/libc.a index 59c90e4c9..ac6dcbf58 100644 Binary files a/ndk/platforms/android-L/arch-mips/lib/libc.a and b/ndk/platforms/android-L/arch-mips/lib/libc.a differ diff --git a/ndk/platforms/android-L/arch-mips/lib/libstdc++.a b/ndk/platforms/android-L/arch-mips/lib/libstdc++.a index 3126c9583..1896a36df 100644 Binary files a/ndk/platforms/android-L/arch-mips/lib/libstdc++.a and b/ndk/platforms/android-L/arch-mips/lib/libstdc++.a differ diff --git a/ndk/platforms/android-L/arch-mips/lib/libz.a b/ndk/platforms/android-L/arch-mips/lib/libz.a index c0a170f00..f843e4035 100644 Binary files a/ndk/platforms/android-L/arch-mips/lib/libz.a and b/ndk/platforms/android-L/arch-mips/lib/libz.a differ diff --git a/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt index 5fc9e4e73..829f8d1e4 100644 --- a/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt @@ -25,6 +25,7 @@ __dn_skipname __epoll_pwait __errno __exit +__fadvise64 __fcntl64 __fgets_chk __fp_nquery @@ -37,6 +38,7 @@ __fstatfs64 __futex_wait __futex_wake __get_h_errno +__get_thread __get_tls __getcpu __getcwd @@ -125,6 +127,7 @@ __sched_cpualloc __sched_cpucount __sched_cpufree __sched_getaffinity +__set_errno __set_tid_address __set_tls __sigaction @@ -149,6 +152,7 @@ __strncpy_chk __strncpy_chk2 __strrchr_chk __swbuf +__swsetup __sym_ntop __sym_ntos __sym_ston @@ -204,6 +208,7 @@ android_gethostbyaddrfornet android_gethostbynamefornet android_set_abort_message arc4random +arc4random_addrandom arc4random_buf arc4random_stir arc4random_uniform @@ -268,6 +273,7 @@ dirfd dirname dirname_r div +dlmalloc_usable_size dn_expand dprintf drand48 @@ -658,6 +664,8 @@ pipe pipe2 poll popen +posix_fadvise +posix_fadvise64 posix_fallocate posix_fallocate64 posix_memalign @@ -714,6 +722,7 @@ pthread_getattr_np pthread_getcpuclockid pthread_getschedparam pthread_getspecific +pthread_gettid_np pthread_join pthread_key_create pthread_key_delete diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libc.a b/ndk/platforms/android-L/arch-mips64/lib64/libc.a index d7f32e115..d49e78615 100644 Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libc.a and b/ndk/platforms/android-L/arch-mips64/lib64/libc.a differ diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libm.a b/ndk/platforms/android-L/arch-mips64/lib64/libm.a index 8ed9bf818..54ae7d2ca 100644 Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libm.a and b/ndk/platforms/android-L/arch-mips64/lib64/libm.a differ diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a b/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a index ef9a024d1..a64f2cf02 100644 Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a and b/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a differ diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libz.a b/ndk/platforms/android-L/arch-mips64/lib64/libz.a index dc9ac55f8..ba98a5fac 100644 Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libz.a and b/ndk/platforms/android-L/arch-mips64/lib64/libz.a differ diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt index c0c86a525..7dddb2a4a 100644 --- a/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt @@ -578,6 +578,8 @@ pipe pipe2 poll popen +posix_fadvise +posix_fadvise64 posix_fallocate posix_fallocate64 posix_memalign @@ -629,6 +631,7 @@ pthread_getattr_np pthread_getcpuclockid pthread_getschedparam pthread_getspecific +pthread_gettid_np pthread_join pthread_key_create pthread_key_delete diff --git a/ndk/platforms/android-L/arch-x86/lib/libc.a b/ndk/platforms/android-L/arch-x86/lib/libc.a index d96fd700e..94a33f3e0 100644 Binary files a/ndk/platforms/android-L/arch-x86/lib/libc.a and b/ndk/platforms/android-L/arch-x86/lib/libc.a differ diff --git a/ndk/platforms/android-L/arch-x86/lib/libm.a b/ndk/platforms/android-L/arch-x86/lib/libm.a index 7fba0e850..a944a6a92 100644 Binary files a/ndk/platforms/android-L/arch-x86/lib/libm.a and b/ndk/platforms/android-L/arch-x86/lib/libm.a differ diff --git a/ndk/platforms/android-L/arch-x86/lib/libstdc++.a b/ndk/platforms/android-L/arch-x86/lib/libstdc++.a index ae4f250bc..4565d3f30 100644 Binary files a/ndk/platforms/android-L/arch-x86/lib/libstdc++.a and b/ndk/platforms/android-L/arch-x86/lib/libstdc++.a differ diff --git a/ndk/platforms/android-L/arch-x86/lib/libz.a b/ndk/platforms/android-L/arch-x86/lib/libz.a index ba005d031..6ea48c692 100644 Binary files a/ndk/platforms/android-L/arch-x86/lib/libz.a and b/ndk/platforms/android-L/arch-x86/lib/libz.a differ diff --git a/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt index 9eb705e07..cf05fd4d7 100644 --- a/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt @@ -25,6 +25,7 @@ __dn_skipname __epoll_pwait __errno __exit +__fadvise64 __fcntl64 __fgets_chk __fp_nquery @@ -37,6 +38,7 @@ __fstatfs64 __futex_wait __futex_wake __get_h_errno +__get_thread __get_tls __getcpu __getcwd @@ -125,6 +127,7 @@ __sched_cpualloc __sched_cpucount __sched_cpufree __sched_getaffinity +__set_errno __set_thread_area __set_tid_address __sigaction @@ -149,6 +152,7 @@ __strncpy_chk __strncpy_chk2 __strrchr_chk __swbuf +__swsetup __sym_ntop __sym_ntos __sym_ston @@ -201,6 +205,7 @@ android_gethostbyaddrfornet android_gethostbynamefornet android_set_abort_message arc4random +arc4random_addrandom arc4random_buf arc4random_stir arc4random_uniform @@ -264,6 +269,7 @@ dirfd dirname dirname_r div +dlmalloc_usable_size dn_expand dprintf drand48 @@ -654,6 +660,8 @@ pipe pipe2 poll popen +posix_fadvise +posix_fadvise64 posix_fallocate posix_fallocate64 posix_memalign @@ -710,6 +718,7 @@ pthread_getattr_np pthread_getcpuclockid pthread_getschedparam pthread_getspecific +pthread_gettid_np pthread_join pthread_key_create pthread_key_delete diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libc.a b/ndk/platforms/android-L/arch-x86_64/lib64/libc.a index 5192b9872..830077f4d 100644 Binary files a/ndk/platforms/android-L/arch-x86_64/lib64/libc.a and b/ndk/platforms/android-L/arch-x86_64/lib64/libc.a differ diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libm.a b/ndk/platforms/android-L/arch-x86_64/lib64/libm.a index de6f4aa08..991cc053c 100644 Binary files a/ndk/platforms/android-L/arch-x86_64/lib64/libm.a and b/ndk/platforms/android-L/arch-x86_64/lib64/libm.a differ diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libstdc++.a b/ndk/platforms/android-L/arch-x86_64/lib64/libstdc++.a index 92d47c8c8..18a78a483 100644 Binary files a/ndk/platforms/android-L/arch-x86_64/lib64/libstdc++.a and b/ndk/platforms/android-L/arch-x86_64/lib64/libstdc++.a differ diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libz.a b/ndk/platforms/android-L/arch-x86_64/lib64/libz.a index f8476cb7d..ca200a419 100644 Binary files a/ndk/platforms/android-L/arch-x86_64/lib64/libz.a and b/ndk/platforms/android-L/arch-x86_64/lib64/libz.a differ diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt index c0c86a525..7dddb2a4a 100644 --- a/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt @@ -578,6 +578,8 @@ pipe pipe2 poll popen +posix_fadvise +posix_fadvise64 posix_fallocate posix_fallocate64 posix_memalign @@ -629,6 +631,7 @@ pthread_getattr_np pthread_getcpuclockid pthread_getschedparam pthread_getspecific +pthread_gettid_np pthread_join pthread_key_create pthread_key_delete diff --git a/ndk/platforms/android-L/include/android/keycodes.h b/ndk/platforms/android-L/include/android/keycodes.h index 813d41188..75d0ab69e 100644 --- a/ndk/platforms/android-L/include/android/keycodes.h +++ b/ndk/platforms/android-L/include/android/keycodes.h @@ -274,7 +274,35 @@ enum { AKEYCODE_12 = 228, AKEYCODE_LAST_CHANNEL = 229, AKEYCODE_TV_DATA_SERVICE = 230, - AKEYCODE_VOICE_ASSIST = 231 + AKEYCODE_VOICE_ASSIST = 231, + AKEYCODE_TV_RADIO_SERVICE = 232, + AKEYCODE_TV_TELETEXT = 233, + AKEYCODE_TV_NUMBER_ENTRY = 234, + AKEYCODE_TV_TERRESTRIAL_ANALOG = 235, + AKEYCODE_TV_TERRESTRIAL_DIGITAL = 236, + AKEYCODE_TV_SATELLITE = 237, + AKEYCODE_TV_SATELLITE_BS = 238, + AKEYCODE_TV_SATELLITE_CS = 239, + AKEYCODE_TV_SATELLITE_SERVICE = 240, + AKEYCODE_TV_NETWORK = 241, + AKEYCODE_TV_ANTENNA_CABLE = 242, + AKEYCODE_TV_INPUT_HDMI_1 = 243, + AKEYCODE_TV_INPUT_HDMI_2 = 244, + AKEYCODE_TV_INPUT_HDMI_3 = 245, + AKEYCODE_TV_INPUT_HDMI_4 = 246, + AKEYCODE_TV_INPUT_COMPOSITE_1 = 247, + AKEYCODE_TV_INPUT_COMPOSITE_2 = 248, + AKEYCODE_TV_INPUT_COMPONENT_1 = 249, + AKEYCODE_TV_INPUT_COMPONENT_2 = 250, + AKEYCODE_TV_INPUT_VGA_1 = 251, + AKEYCODE_TV_AUDIO_DESCRIPTION = 252, + AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP = 253, + AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN = 254, + AKEYCODE_TV_ZOOM_MODE = 255, + AKEYCODE_TV_CONTENTS_MENU = 256, + AKEYCODE_TV_MEDIA_CONTEXT_MENU = 257, + AKEYCODE_TV_TIMER_PROGRAMMING = 258, + AKEYCODE_HELP = 259 // NOTE: If you add a new keycode here you must also add it to several other files. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list. diff --git a/ndk/platforms/android-L/include/fcntl.h b/ndk/platforms/android-L/include/fcntl.h index 4450bb65f..8f89afbb4 100644 --- a/ndk/platforms/android-L/include/fcntl.h +++ b/ndk/platforms/android-L/include/fcntl.h @@ -72,6 +72,8 @@ extern int openat(int, const char*, int, ...); extern int openat64(int, const char*, int, ...); extern int open(const char*, int, ...); extern int open64(const char*, int, ...); +extern int posix_fadvise64(int, off64_t, off64_t, int); +extern int posix_fadvise(int, off_t, off_t, int); extern int posix_fallocate64(int, off64_t, off64_t); extern int posix_fallocate(int, off_t, off_t); extern ssize_t splice(int, off64_t*, int, off64_t*, size_t, unsigned int); diff --git a/ndk/platforms/android-L/include/libgen.h b/ndk/platforms/android-L/include/libgen.h index c5fc76a79..9dcec75cc 100644 --- a/ndk/platforms/android-L/include/libgen.h +++ b/ndk/platforms/android-L/include/libgen.h @@ -33,24 +33,15 @@ __BEGIN_DECLS -/* our version of dirname/basename don't modify the input path */ -extern char* dirname (const char* path); -extern char* basename(const char* path); +/* On Android these don't modify their input, and use thread-local storage for their results. */ +extern char* basename(const char*); +extern char* dirname(const char*); -/* special thread-safe Bionic versions - * - * if 'buffer' is NULL, 'bufflen' is ignored and the length of the result is returned - * otherwise, place result in 'buffer' - * - * at most bufflen-1 characters written, plus a terminating zero - * - * return length of result, or -1 in case of error, with errno set to: - * - * ERANGE: buffer is too short - * ENAMETOOLONG: the result is too long for a valid path - */ -extern int dirname_r(const char* path, char* buffer, size_t bufflen); -extern int basename_r(const char* path, char* buffer, size_t bufflen); +#if !defined(__LP64__) +/* These non-standard functions are not needed on Android; basename and dirname use thread-local storage. */ +extern int dirname_r(const char*, char*, size_t); +extern int basename_r(const char*, char*, size_t); +#endif __END_DECLS diff --git a/ndk/platforms/android-L/include/pthread.h b/ndk/platforms/android-L/include/pthread.h index 29caafc6d..86a10051e 100644 --- a/ndk/platforms/android-L/include/pthread.h +++ b/ndk/platforms/android-L/include/pthread.h @@ -188,6 +188,8 @@ int pthread_getschedparam(pthread_t, int*, struct sched_param*) __nonnull((2, 3) void* pthread_getspecific(pthread_key_t); +pid_t pthread_gettid_np(pthread_t); + int pthread_join(pthread_t, void**); int pthread_key_create(pthread_key_t*, void (*)(void*)) __nonnull((1));