am d3d89f0d: Merge "Add arc4random_addrandom binary compatibility."

* commit 'd3d89f0d28aba2db9f11cc0a9b3a865fa1d9d265':
  Add arc4random_addrandom binary compatibility.
This commit is contained in:
Elliott Hughes 2014-09-08 18:11:52 +00:00 committed by Android Git Automerger
commit ffa8672bd5
1 changed files with 5 additions and 0 deletions

View File

@ -308,6 +308,11 @@ extern "C" void arc4random_stir(void) {
// The current implementation stirs itself as needed.
}
// This was removed from BSD.
extern "C" void arc4random_addrandom(unsigned char*, int) {
// The current implementation adds randomness as needed.
}
// Old versions of the NDK did not export malloc_usable_size, but did
// export dlmalloc_usable_size. We are moving away from dlmalloc in L
// so make this call malloc_usable_size.