Implement face stipples on Android

* .gitignore:

* java/Makefile.in: Fix typos.

* java/org/gnu/emacs/EmacsFillRectangle.java (perform): Call
blitOpaqueStipple if filling an unobscured rectangle with an
opaque stipple.

* java/org/gnu/emacs/EmacsGC.java (EmacsGC) <tileObject>: New
field.
(markDirty): Synchronize the current stipple with tileObject.
(prepareStipple, blitOpaqueStipple): New functions.

* java/org/gnu/emacs/EmacsService.java (EmacsService)
<resources>: New static field.
(onCreate): Set it.

* src/android.c (android_create_bitmap_from_data): Correct order
of arguments to android_create_pixmap_from_bitmap_data.
(HAS_BUILTIN_TRAP): Delete macro.
(emacs_abort): Always induce backtraces by means of a NULL
pointer deference.

* src/dispextern.h (Emacs_GC, Emacs_Rectangle, GCForeground)
(GCBackground, GCFillStyle, GCStipple, FillOpaqueStipple)
[HAVE_ANDROID]: Define to their Android counterparts rather
than simulating their existence.

* src/epaths.in: Set bitmap path to /assets/bitmaps on Android.

* src/image.c (image_bitmap_pixmap): Also enable when
HAVE_ANDROID.

* src/sfntfont-android.c (sfntfont_android_put_glyphs): Assert
that this is never called to draw a stippled background.
* src/xfaces.c (x_create_gc) [HAVE_ANDROID]: Redefine as
wrapper around android_create_gc.
(prepare_face_for_display) [HAVE_ANDROID]: Enable stipples.

1 files changed, 6 insertions, 3 deletions

diff --git a/java/Makefile.in b/java/Makefile.in
index abddae6b5cf..35d2637837c 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -197,10 +197,13 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES)
         $(AM_V_SILENT) mkdir -p install_temp/assets/etc
         $(AM_V_SILENT) mkdir -p install_temp/assets/lisp
         $(AM_V_SILENT) mkdir -p install_temp/assets/info
-# Install architecture independents to assets/etc and assets/lisp
+        $(AM_V_SILENT) mkdir -p install_temp/assets/bitmaps
+# Install architecture independents to assets/etc, assets/lisp and
+# assets/bitmaps
         $(AM_V_SILENT) cp -r $(top_srcdir)/lisp install_temp/assets
         $(AM_V_SILENT) cp -r $(top_srcdir)/etc install_temp/assets
         $(AM_V_SILENT) cp -r $(top_srcdir)/info install_temp/assets
+        $(AM_V_SILENT) cp -r $(top_srcdir)/src/bitmaps install_temp/assets
 # Replace etc/DOC generated by compiling Emacs for the build machine
 # with etc/DOC from the cross-compiled Emacs.
         $(AM_V_SILENT) test -f $(top_builddir)/cross/etc/DOC    \
@@ -354,8 +357,8 @@ public static final String[] EMACS_SHARED_LIBRARIES\
 
 # cf-stamp-1 is a phony target invoked in a second `make' instance after
 # all shared libraries are compiled, because the computation of
-# ALL_DEPENDENCIES cannot be postponed until that stage in this instance
-# of Make.
+# ALL_DEPENDENCIES in this instance of Make cannot be postponed until
+# that stage.
 cf-stamp: $(NDK_BUILD_SHARED) $(CROSS_LIBS)
         $(AM_V_EMACSCONFIG) $(MAKE) cf-stamp-1
         $(AM_V_at) touch $@