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, 2 insertions, 20 deletions

diff --git a/src/android.c b/src/android.c
index 7a7eadc946a..e44b58c5973 100644
--- a/src/android.c
+++ b/src/android.c
@@ -4882,8 +4882,8 @@ android_pixmap
 android_create_bitmap_from_data (char *bits, unsigned int width,
                                  unsigned int height)
 {
-  return android_create_pixmap_from_bitmap_data (bits, 1, 0,
-                                                 width, height, 1);
+  return android_create_pixmap_from_bitmap_data (bits, width, height,
+                                                 1, 0, 1);
 }
 
 struct android_image *
@@ -5994,40 +5994,22 @@ android_toggle_on_screen_keyboard (android_window window, bool show)
 
 
 
-#if defined __clang_major__ && __clang_major__ < 5
-# define HAS_BUILTIN_TRAP 0
-#elif 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))
-# define HAS_BUILTIN_TRAP 1
-#elif defined __has_builtin
-# define HAS_BUILTIN_TRAP __has_builtin (__builtin_trap)
-#else /* !__has_builtin */
-# define HAS_BUILTIN_TRAP 0
-#endif /* defined __clang_major__ && __clang_major__ < 5 */
-
 /* emacs_abort implementation for Android.  This logs a stack
    trace.  */
 
 void
 emacs_abort (void)
 {
-#ifndef HAS_BUILTIN_TRAP
   volatile char *foo;
-#endif /* !HAS_BUILTIN_TRAP */
 
   __android_log_print (ANDROID_LOG_FATAL, __func__,
                        "emacs_abort called, please review the following"
                        " stack trace");
 
-#ifndef HAS_BUILTIN_TRAP
   /* Induce a NULL pointer dereference to make debuggerd generate a
      tombstone.  */
   foo = NULL;
   *foo = '\0';
-#else /* HAS_BUILTIN_TRAP */
-  /* Crash through __builtin_trap instead.  This appears to more
-     uniformly elicit crash reports from debuggerd.  */
-  __builtin_trap ();
-#endif /* !HAS_BUILTIN_TRAP */
 
   abort ();
 }