[droid] add an implementation of rand_r

Also create a place for us to add missing bionic functions. This is
_purposefully_ done inside of XBMC rather than as a separate helper-lib to
discourage adding stuff here. Instead, we should be pushing to get them into
the ndk.

diff --git a/Makefile.in b/Makefile.in
index 771b15d..4d4fe73 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -150,6 +150,7 @@ ifeq (@USE_ANDROID@,1)
 DIRECTORY_ARCHIVES += xbmc/android/loader/AndroidDyload.a
 DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a
 DIRECTORY_ARCHIVES += xbmc/android/activity/activity.a
+DIRECTORY_ARCHIVES += xbmc/android/bionic_supplement/bionic_supplement.a
 endif
 
 ifeq (@USE_AMLPLAYER@,1)

diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index f2a8d47..d4fd72b 100644 (file)
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -35,7 +35,9 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #endif
-
+#if defined(TARGET_ANDROID)
+#include "android/bionic_supplement/bionic_supplement.h"
+#endif
 #include <stdlib.h>
 
 #include "Application.h"

diff --git a/xbmc/android/bionic_supplement/Makefile b/xbmc/android/bionic_supplement/Makefile
new file mode 100644 (file)
index 0000000..219c6ad
--- /dev/null
+++ b/xbmc/android/bionic_supplement/Makefile
@@ -0,0 +1,5 @@
+SRCS     = rand_r.c
+LIB      = bionic_supplement.a
+
+include ../../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

diff --git a/xbmc/android/bionic_supplement/bionic_supplement.h b/xbmc/android/bionic_supplement/bionic_supplement.h
new file mode 100644 (file)
index 0000000..8329a1f
--- /dev/null
+++ b/xbmc/android/bionic_supplement/bionic_supplement.h
@@ -0,0 +1,30 @@
+#pragma once
+/*
+ *      Copyright (C) 2012 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+int rand_r (unsigned int *seed);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */

diff --git a/xbmc/android/bionic_supplement/rand_r.c b/xbmc/android/bionic_supplement/rand_r.c
new file mode 100644 (file)
index 0000000..6100440
--- /dev/null
+++ b/xbmc/android/bionic_supplement/rand_r.c
@@ -0,0 +1,48 @@
+/* Reentrant random function frm POSIX.1c.
+   Copyright (C) 1996, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com <mailto:drepper@cygnus.com>>, 1996.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdlib.h>
+
+
+/* This algorithm is mentioned in the ISO C standard, here extended
+   for 32 bits.  */
+int rand_r (unsigned int *seed)
+{
+    unsigned int next = *seed;
+    int result;
+
+    next *= 1103515245;
+    next += 12345;
+    result = (unsigned int) (next / 65536) % 2048;
+
+    next *= 1103515245;
+    next += 12345;
+    result <<= 10;
+    result ^= (unsigned int) (next / 65536) % 1024;
+
+    next *= 1103515245;
+    next += 12345;
+    result <<= 10;
+    result ^= (unsigned int) (next / 65536) % 1024;
+
+    *seed = next;
+
+    return result;
+}