am 289d24e0: am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"

* commit '289d24e09a72d41c7c2675969083b0e755efa787': Add back arc4random_stir for 32-bit android-L
2014-09-08 03:05:03 +00:00
parent 23eeb3eed9 289d24e09a
commit 611d66bbf5
3 changed files with 3 additions and 0 deletions
--- a/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt
@@ -343,6 +343,7 @@ android_gethostbynamefornet
 android_set_abort_message
 arc4random
 arc4random_buf
+arc4random_stir
 arc4random_uniform
 asctime
 asctime64
--- a/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt
@@ -206,6 +206,7 @@ android_gethostbynamefornet
 android_set_abort_message
 arc4random
 arc4random_buf
+arc4random_stir
 arc4random_uniform
 asctime
 asctime64
--- a/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt
@@ -203,6 +203,7 @@ android_gethostbynamefornet
 android_set_abort_message
 arc4random
 arc4random_buf
+arc4random_stir
 arc4random_uniform
 asctime
 asctime64