Improve reliability of Android build system

* .gitignore: Add new files.
* INSTALL.android: New file.
* Makefile.in (clean_dirs): Clean xcompile as well.
* admin/merge-gnulib (avoided_flags): Import gnulib into Android
directory as well.
* doc/emacs/android.texi (Android):
* doc/emacs/emacs.texi (Top): New node `Android'.
* java/org/gnu/emacs/EmacsThread.java (run): Use right
executable name.
* lib/Makefile.in (ANDROID_CFLAGS): Use better way to refer to
/src.
(vpath): Delete ugly block of vpath statements.
(mostlyclean): Remove Makefile.android.
* lib/fpending.c (__fpending):
* lib/open.c:
* lib/unistd.c (_GL_UNISTD_INLINE): Revert changes to gnulib in
lib/.
* src/android.h:
* src/androidterm.c: Fix build.
* xcompile/Makefile.in (LIB_SRCDIR):
(LIBSRC_BINARIES, src/verbose.mk):
(PRE_BUILD_DEPS, PHONY): Use gnulib in xcompile/lib/ as opposed
to lib/.
* xcompile/README: Adjust README.

1 files changed, 10 insertions, 1 deletions

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index e17ecd95ac3..b99e38672a4 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -114,6 +114,11 @@ for module in $AVOIDED_MODULES; do
   avoided_flags="$avoided_flags --avoid=$module"
 done
 
+# Clean the lib directory as well.
+if [ -e "$src"/lib/Makefile ]; then
+   make -C "$src"/lib maintainer-clean
+fi
+
 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
         $avoided_flags $GNULIB_MODULES &&
 rm -- "$src"lib/gl_openssl.h \
@@ -135,4 +140,8 @@ cp -- "$gnulib_srcdir"/lib/af_alg.h \
 { test -z "$src" || cd "$src"; } &&
 ./autogen.sh
 
-echo "Please update the block of vpath statements in lib/Makefile.in"
+# Finally, update the files in lib/ to xcompile/lib.
+rsync "$src"/lib "$src"/xcompile
+
+# Remove unnecessary files.
+rm -f "$src"/xcompile/lib/*.mk.in "$src"/xcompile/lib/Makefile.in