Update Android port

* src/image.c (image_create_bitmap_from_data): Fix typo in
preprocessor conditionals.

diff --git a/src/image.c b/src/image.c
index dc66b1056dbcedeebc0cabdede524cec5853b6f3..75168291708455e1d8c0fad5c4b92ae88bc756e1 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -634,8 +634,10 @@ image_create_bitmap_from_data (struct frame *f, char *bits,
   dpyinfo->bitmaps[id - 1].width = width;
   dpyinfo->bitmaps[id - 1].refcount = 1;
 
-#if defined HAVE_X_WINDOWS && defined HAVE_ANDROID
+#if defined HAVE_X_WINDOWS || defined HAVE_ANDROID
+#ifndef ANDROID_STUBIFY
   dpyinfo->bitmaps[id - 1].pixmap = bitmap;
+#endif /* ANDROID_STUBIFY */
   dpyinfo->bitmaps[id - 1].have_mask = false;
   dpyinfo->bitmaps[id - 1].depth = 1;
 #ifdef USE_CAIRO