Update Android port

* src/android.c (android_run_select_thread, android_init_events)
(android_select): Add alternative android_select implementation
for API 16 and lower.
* src/androidterm.c (handle_one_android_event): Fix
use-after-frees.

1 files changed, 4 insertions, 3 deletions

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 38f1418c759..a6824cb2267 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -140,8 +140,9 @@ cp -- "$gnulib_srcdir"/lib/af_alg.h \
 { test -z "$src" || cd "$src"; } &&
 ./autogen.sh
 
-# Finally, update the files in lib/ to xcompile/lib.
-rsync -r "$src"/lib "$src"/xcompile
+# Finally, copy gnulib stuff in lib/ to xcompile/lib.
+rm -rf "$src"xcompile/lib
+cp -r "$src"lib "$src"xcompile
 
 # Remove unnecessary files.
-rm -f "$src"/xcompile/lib/*.mk.in "$src"/xcompile/lib/Makefile.in
+rm -f "$src"xcompile/lib/*.mk.in "$src"xcompile/lib/Makefile.in