feature/android ab10d1f6634: Update Android port

[Po Lu]

branch: feature/android
commit ab10d1f6634f1d09e447427c442eb206ce6afc0b
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Update Android port
    
    * src/image.c (image_create_bitmap_from_data): Fix typo in
    preprocessor conditionals.
---
 src/image.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/image.c b/src/image.c
index dc66b1056db..75168291708 100644
--- 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