5 files changed, 148 insertions, 5 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8b950136241..caf8e0fbec3 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -20,6 +20,130 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+# This is not empty if this is a Makefile that will be copied to
+# xcompile/lib.
+XCONFIGURE = @XCONFIGURE@
+
+# This is required to make sure symbol visibility is correct and
+# functions like readlinkat do not end up replacing their OS
+# counterparts.
+ANDROID_CFLAGS = @ANDROID_CFLAGS@
+
+ifneq ($(XCONFIGURE),)
+
+# Set vpath.  Only look for C files and some headers in srcdir:
+# Headers that are generated by gnulib must be spared, or otherwise
+# the versions previously built on the host will be used, if builddir
+# is the same as srcdir.  Following this is a list of files in lib/
+# that are not generated during the gnulib build process.  Please keep
+# it up to date!
+
+vpath _Noreturn.h $(srcdir)
+vpath acl-internal.h $(srcdir)
+vpath acl.h $(srcdir)
+vpath af_alg.h $(srcdir)
+vpath alloca.in.h $(srcdir)
+vpath allocator.h $(srcdir)
+vpath arg-nonnull.h $(srcdir)
+vpath assert.in.h $(srcdir)
+vpath attribute.h $(srcdir)
+vpath binary-io.h $(srcdir)
+vpath byteswap.in.h $(srcdir)
+vpath c++defs.h $(srcdir)
+vpath c-ctype.h $(srcdir)
+vpath c-strcase.h $(srcdir)
+vpath careadlinkat.h $(srcdir)
+vpath cdefs.h $(srcdir)
+vpath cloexec.h $(srcdir)
+vpath close-stream.h $(srcdir)
+vpath count-leading-zeros.h $(srcdir)
+vpath count-one-bits.h $(srcdir)
+vpath count-trailing-zeros.h $(srcdir)
+vpath diffseq.h $(srcdir)
+vpath dirent.h $(srcdir)
+vpath dirent.in.h $(srcdir)
+vpath dynarray.h $(srcdir)
+vpath eloop-threshold.h $(srcdir)
+vpath errno.in.h $(srcdir)
+vpath execinfo.in.h $(srcdir)
+vpath fcntl.in.h $(srcdir)
+vpath filemode.h $(srcdir)
+vpath filename.h $(srcdir)
+vpath filevercmp.h $(srcdir)
+vpath fingerprint.h $(srcdir)
+vpath flexmember.h $(srcdir)
+vpath fpending.h $(srcdir)
+vpath fsusage.h $(srcdir)
+vpath ftoastr.h $(srcdir)
+vpath getopt-cdefs.in.h $(srcdir)
+vpath getopt-core.h $(srcdir)
+vpath getopt-ext.h $(srcdir)
+vpath getopt-pfx-core.h $(srcdir)
+vpath getopt-pfx-ext.h $(srcdir)
+vpath getopt.in.h $(srcdir)
+vpath getopt_int.h $(srcdir)
+vpath gettext.h $(srcdir)
+vpath idx.h $(srcdir)
+vpath ieee754.in.h $(srcdir)
+vpath ignore-value.h $(srcdir)
+vpath intprops-internal.h $(srcdir)
+vpath intprops.h $(srcdir)
+vpath inttypes.in.h $(srcdir)
+vpath libc-config.h $(srcdir)
+vpath limits.in.h $(srcdir)
+vpath malloc/dynarray.h $(srcdir)
+vpath malloc/scratch_buffer.h $(srcdir)
+vpath md5.h $(srcdir)
+vpath min-max.h $(srcdir)
+vpath mini-gmp.h $(srcdir)
+vpath minmax.h $(srcdir)
+vpath mktime-internal.h $(srcdir)
+vpath nproc.h $(srcdir)
+vpath openat-priv.h $(srcdir)
+vpath openat.h $(srcdir)
+vpath pathmax.h $(srcdir)
+vpath regex.h $(srcdir)
+vpath regex_internal.h $(srcdir)
+vpath root-uid.h $(srcdir)
+vpath save-cwd.h $(srcdir)
+vpath scratch_buffer.h $(srcdir)
+vpath sha1.h $(srcdir)
+vpath sha256.h $(srcdir)
+vpath sha512.h $(srcdir)
+vpath sig2str.h $(srcdir)
+vpath signal.in.h $(srcdir)
+vpath stat-time.h $(srcdir)
+vpath stdalign.in.h $(srcdir)
+vpath stdckdint.in.h $(srcdir)
+vpath stddef.in.h $(srcdir)
+vpath stdint.in.h $(srcdir)
+vpath stdio-impl.h $(srcdir)
+vpath stdio.h $(srcdir)
+vpath stdio.in.h $(srcdir)
+vpath stdlib.in.h $(srcdir)
+vpath str-two-way.h $(srcdir)
+vpath strftime.h $(srcdir)
+vpath string.in.h $(srcdir)
+vpath sys_random.in.h $(srcdir)
+vpath sys_select.in.h $(srcdir)
+vpath sys_stat.in.h $(srcdir)
+vpath sys_time.in.h $(srcdir)
+vpath sys_types.in.h $(srcdir)
+vpath tempname.h $(srcdir)
+vpath time-internal.h $(srcdir)
+vpath time.in.h $(srcdir)
+vpath timespec.h $(srcdir)
+vpath u64.h $(srcdir)
+vpath unistd.in.h $(srcdir)
+vpath unlocked-io.h $(srcdir)
+vpath utimens.h $(srcdir)
+vpath verify.h $(srcdir)
+vpath vla.h $(srcdir)
+vpath warn-on-use.h $(srcdir)
+vpath xalloc-oversized.h $(srcdir)
+vpath %.c $(srcdir)
+endif
+
 # Variables substituted by 'configure', and not autogenerated in gnulib.mk,
 # or needed before gnulib.mk is included.
 abs_top_srcdir = @abs_top_srcdir@
@@ -33,11 +157,11 @@ all:
 
 HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@
 
-ALL_CFLAGS= \
+ALL_CFLAGS = \
   $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) $(DEPFLAGS) \
   $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \
   -I. -I../src -I$(srcdir) -I$(srcdir)/../src \
-  $(if $(patsubst e-%,,$(notdir $<)),,-Demacs)
+  $(if $(patsubst e-%,,$(notdir $<)),,-Demacs) $(ANDROID_CFLAGS)
 
 ifeq ($(HAVE_NATIVE_COMP),yes)
 ALL_CFLAGS += -DGL_COMPILE_CRYPTO_STREAM
@@ -52,6 +176,12 @@ ifneq ($(SYSTEM_TYPE),windows-nt)
   libgnu_a_SOURCES += openat-die.c save-cwd.c
 endif
 
+ifeq ($(XCONFIGURE),android)
+# The next line is necessary to override -I$(srcdir), which will end
+# up pulling in lots of headers from the host.
+ALL_CFLAGS += -I$(top_srcdir)/xcompile -I.
+endif
+
 DEPDIR = deps
 ifeq ($(AUTO_DEPEND),yes)
   DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP
@@ -60,11 +190,14 @@ else
   DEPFLAGS =
 endif
 
+# This piece of code interferes with cross compilation
+ifeq ($(XCONFIGURE),)
 .PRECIOUS: ../config.status Makefile
 ../config.status: $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4
         $(MAKE) -C .. $(notdir $@)
 Makefile: ../config.status $(srcdir)/Makefile.in
         $(MAKE) -C .. lib/$@
+endif
 
 # Object modules that need not be built for Emacs.
 # Emacs does not need e-regex.o (it has its own regex-emacs.c),
diff --git a/lib/faccessat.c b/lib/faccessat.c
index c1737d03a10..30a22da7eb1 100644
--- a/lib/faccessat.c
+++ b/lib/faccessat.c
@@ -43,7 +43,11 @@ orig_faccessat (int fd, char const *name, int mode, int flag)
 /* Write "unistd.h" here, not <unistd.h>, otherwise OSF/1 5.1 DTK cc
    eliminates this include because of the preliminary #include <unistd.h>
    above.  */
+#ifdef __ANROID__
+#include <unistd.h>
+#else
 #include "unistd.h"
+#endif
 
 #ifndef HAVE_ACCESS
 /* Mingw lacks access, but it also lacks real vs. effective ids, so
diff --git a/lib/fpending.c b/lib/fpending.c
index 6408cff4647..45daa2586a0 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -33,13 +33,15 @@
 size_t
 __fpending (FILE *fp)
 {
+#if defined __ANDROID__
+  return 0;
   /* Most systems provide FILE as a struct and the necessary bitmask in
      <stdio.h>, because they need it for implementing getc() and putc() as
      fast macros.  */
-#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+#elif defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
   /* GNU libc, BeOS, Haiku, Linux libc5 */
   return fp->_IO_write_ptr - fp->_IO_write_base;
-#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+#elif defined __sferror || defined __DragonFly__
   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */
   return fp->_p - fp->_bf._base;
 #elif defined __EMX__                /* emx+gcc */
diff --git a/lib/open.c b/lib/open.c
index 170bff108e3..dd7c90b3bd6 100644
--- a/lib/open.c
+++ b/lib/open.c
@@ -40,7 +40,11 @@ orig_open (const char *filename, int flags, mode_t mode)
 /* Specification.  */
 /* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
    this include because of the preliminary #include <fcntl.h> above.  */
+#ifdef __ANDROID__
+#include <fnctl.h>
+#else
 #include "fcntl.h"
+#endif
 
 #include "cloexec.h"
 
diff --git a/lib/unistd.c b/lib/unistd.c
index 95978e6ad0a..dcc70091155 100644
--- a/lib/unistd.c
+++ b/lib/unistd.c
@@ -18,5 +18,5 @@
 #include <config.h>
 
 #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
-#include "unistd.h"
+#include <unistd.h>
 typedef int dummy;