Use upstream OpenBSD's arc4random.
The getentropy_linux.c is lightly modified to build on Android, but we're now
completely in sync with upstream OpenBSD's arc4random implementation.
(cherry picked from commit 2b67d7dee09852789d9ac7d8972ed6cdb2c18430)
Change-Id: Icc939b5fa2fcac3e15ff93735d2d34f67e9bb149
diff --git a/libc/Android.mk b/libc/Android.mk
index fd3da96..0bdf1a5 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -37,7 +37,6 @@
# Define the common source files for all the libc instances
# =========================================================
libc_common_src_files := \
- bionic/arc4random.c \
bionic/bindresvport.c \
bionic/daemon.c \
bionic/err.c \
@@ -124,6 +123,7 @@
bionic/futimens.cpp \
bionic/getauxval.cpp \
bionic/getcwd.cpp \
+ bionic/getentropy_linux.c \
bionic/getpgrp.cpp \
bionic/getpid.cpp \
bionic/gettid.cpp \
@@ -335,6 +335,8 @@
upstream-openbsd/lib/libc/gdtoa/strtorQ.c \
libc_upstream_openbsd_src_files := \
+ upstream-openbsd/lib/libc/crypt/arc4random.c \
+ upstream-openbsd/lib/libc/crypt/arc4random_uniform.c \
upstream-openbsd/lib/libc/gen/alarm.c \
upstream-openbsd/lib/libc/gen/ctype_.c \
upstream-openbsd/lib/libc/gen/exec.c \