Merge pull request #203 from tiwoc/android

Android support

23 files changed, 34 insertions, 6 deletions

diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index 369b720c4..546fbf9ad 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -2,4 +2,5 @@ os_type unix
 
 <target_features>
 gettimeofday
+getsid
 </target_features>
diff --git a/src/build-data/os/android.txt b/src/build-data/os/android.txt
new file mode 100644
index 000000000..5df133c8e
--- /dev/null
+++ b/src/build-data/os/android.txt
@@ -0,0 +1,10 @@
+os_type unix
+
+<target_features>
+clock_gettime
+gettimeofday
+posix_mlock
+gmtime_r
+dlopen
+readdir
+</target_features>
diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt
index bedb10732..eb5835a6f 100644
--- a/src/build-data/os/cygwin.txt
+++ b/src/build-data/os/cygwin.txt
@@ -12,4 +12,5 @@ doc_dir docs
 
 <target_features>
 gettimeofday
+getsid
 </target_features>
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index b33548e1a..f5f2589fb 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -14,6 +14,7 @@ gettimeofday
 gmtime_r
 memset_s
 readdir
+getsid
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index 5df133c8e..346145785 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -7,4 +7,5 @@ posix_mlock
 gmtime_r
 dlopen
 readdir
+getsid
 </target_features>
diff --git a/src/build-data/os/haiku.txt b/src/build-data/os/haiku.txt
index 8e35e76eb..981ce6795 100644
--- a/src/build-data/os/haiku.txt
+++ b/src/build-data/os/haiku.txt
@@ -8,6 +8,7 @@ doc_dir system/documentation
 <target_features>
 gettimeofday
 gmtime_r
+getsid
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index 19c230d77..cea405554 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -4,6 +4,7 @@ so_suffix sl
 
 <target_features>
 gettimeofday
+getsid
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/irix.txt b/src/build-data/os/irix.txt
index 369b720c4..546fbf9ad 100644
--- a/src/build-data/os/irix.txt
+++ b/src/build-data/os/irix.txt
@@ -2,4 +2,5 @@ os_type unix
 
 <target_features>
 gettimeofday
+getsid
 </target_features>
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index 9061b31d8..cb78c33ff 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -7,6 +7,7 @@ posix_mlock
 gmtime_r
 dlopen
 readdir
+getsid
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 5df133c8e..346145785 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -7,4 +7,5 @@ posix_mlock
 gmtime_r
 dlopen
 readdir
+getsid
 </target_features>
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index 4c0965764..71c85eb3c 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -6,4 +6,5 @@ gettimeofday
 posix_mlock
 gmtime_r
 dlopen
+getsid
 </target_features>
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index 0ed785036..52749e397 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -6,6 +6,7 @@ install_cmd_exec '/usr/ucb/install -m 755'
 <target_features>
 posix_mlock
 gettimeofday
+getsid
 </target_features>
 
 <aliases>
diff --git a/src/lib/alloc/locking_allocator/info.txt b/src/lib/alloc/locking_allocator/info.txt
index 09b59406c..d3b5e86f8 100644
--- a/src/lib/alloc/locking_allocator/info.txt
+++ b/src/lib/alloc/locking_allocator/info.txt
@@ -1,6 +1,7 @@
 define LOCKING_ALLOCATOR 20131128
 
 <os>
+android
 linux
 freebsd
 netbsd
diff --git a/src/lib/entropy/dev_random/info.txt b/src/lib/entropy/dev_random/info.txt
index 98a6a7e61..d8b7df134 100644
--- a/src/lib/entropy/dev_random/info.txt
+++ b/src/lib/entropy/dev_random/info.txt
@@ -10,6 +10,7 @@ dev_random.h
 
 <os>
 aix
+android
 cygwin
 darwin
 dragonfly
@@ -23,5 +24,4 @@ netbsd
 openbsd
 qnx
 solaris
-tru64
 </os>
diff --git a/src/lib/entropy/egd/info.txt b/src/lib/entropy/egd/info.txt
index fdf5c4959..b7b951c2b 100644
--- a/src/lib/entropy/egd/info.txt
+++ b/src/lib/entropy/egd/info.txt
@@ -16,6 +16,7 @@ qnx -> socket
 </libs>
 
 <os>
+android
 aix
 cygwin
 darwin
@@ -28,5 +29,4 @@ netbsd
 openbsd
 qnx
 solaris
-tru64
 </os>
diff --git a/src/lib/entropy/proc_walk/info.txt b/src/lib/entropy/proc_walk/info.txt
index 2a53a7ed8..c713d3b8e 100644
--- a/src/lib/entropy/proc_walk/info.txt
+++ b/src/lib/entropy/proc_walk/info.txt
@@ -9,6 +9,7 @@ proc_walk.h
 </header:internal>
 
 <os>
+android
 aix
 cygwin
 darwin
@@ -22,7 +23,6 @@ netbsd
 openbsd
 qnx
 solaris
-tru64
 </os>
 
 <requires>
diff --git a/src/lib/entropy/unix_procs/info.txt b/src/lib/entropy/unix_procs/info.txt
index 755d2565d..ee382d8da 100644
--- a/src/lib/entropy/unix_procs/info.txt
+++ b/src/lib/entropy/unix_procs/info.txt
@@ -10,6 +10,7 @@ unix_procs.h
 </header:internal>
 
 <os>
+android
 aix
 cygwin
 darwin
@@ -21,5 +22,4 @@ linux
 netbsd
 qnx
 solaris
-tru64
 </os>
diff --git a/src/lib/entropy/unix_procs/unix_procs.cpp b/src/lib/entropy/unix_procs/unix_procs.cpp
index 3c641da70..c6ad6a700 100644
--- a/src/lib/entropy/unix_procs/unix_procs.cpp
+++ b/src/lib/entropy/unix_procs/unix_procs.cpp
@@ -72,7 +72,9 @@ void UnixProcessInfo_EntropySource::poll(Entropy_Accumulator& accum)
    accum.add(::getppid(), 0.0);
    accum.add(::getuid(),  0.0);
    accum.add(::getgid(),  0.0);
+#if defined(BOTAN_TARGET_OS_HAS_GETSID)
    accum.add(::getsid(0),  0.0);
+#endif
    accum.add(::getpgrp(), 0.0);
 
    struct ::rusage usage;
diff --git a/src/lib/filters/fd_unix/info.txt b/src/lib/filters/fd_unix/info.txt
index 84d6e4775..ea76d0dd7 100644
--- a/src/lib/filters/fd_unix/info.txt
+++ b/src/lib/filters/fd_unix/info.txt
@@ -3,6 +3,7 @@ define PIPE_UNIXFD_IO 20131128
 load_on auto
 
 <os>
+android
 aix
 cygwin
 darwin
@@ -17,5 +18,4 @@ netbsd
 openbsd
 qnx
 solaris
-tru64
 </os>
diff --git a/src/lib/rng/system_rng/info.txt b/src/lib/rng/system_rng/info.txt
index a452a7d9b..987b18c76 100644
--- a/src/lib/rng/system_rng/info.txt
+++ b/src/lib/rng/system_rng/info.txt
@@ -3,6 +3,7 @@ define SYSTEM_RNG 20141202
 # Any system with /dev/random or CryptGenRandom
 
 <os>
+android
 aix
 cygwin
 darwin
@@ -18,6 +19,5 @@ netbsd
 openbsd
 qnx
 solaris
-tru64
 windows
 </os>
diff --git a/src/lib/utils/asm_x86_32/info.txt b/src/lib/utils/asm_x86_32/info.txt
index 6da494629..8eeefe70e 100644
--- a/src/lib/utils/asm_x86_32/info.txt
+++ b/src/lib/utils/asm_x86_32/info.txt
@@ -10,6 +10,7 @@ x86_32
 
 # ELF systems
 <os>
+android
 linux
 freebsd
 dragonfly
diff --git a/src/lib/utils/asm_x86_64/info.txt b/src/lib/utils/asm_x86_64/info.txt
index 0db499d46..8e381486d 100644
--- a/src/lib/utils/asm_x86_64/info.txt
+++ b/src/lib/utils/asm_x86_64/info.txt
@@ -16,6 +16,7 @@ icc
 
 # ELF systems
 <os>
+android
 linux
 netbsd
 openbsd
diff --git a/src/lib/utils/dyn_load/info.txt b/src/lib/utils/dyn_load/info.txt
index 3dc3c5d03..0cc4e4e73 100644
--- a/src/lib/utils/dyn_load/info.txt
+++ b/src/lib/utils/dyn_load/info.txt
@@ -3,6 +3,7 @@ define DYNAMIC_LOADER 20131128
 load_on dep
 
 <os>
+android
 freebsd
 linux
 netbsd
@@ -13,6 +14,7 @@ windows
 </os>
 
 <libs>
+android -> dl
 linux -> dl
 solaris -> dl
 </libs>