1 files changed, 12 insertions, 0 deletions

diff --git a/src/alloc.c b/src/alloc.c
index e7edc0595b3..b8d326f4407 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3342,6 +3342,14 @@ cleanup_vector (struct Lisp_Vector *vector)
               drv->close_font (font);
             }
         }
+
+#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY
+      /* The Android font driver needs the ability to associate extra
+         information with font entities.  */
+      if ((vector->header.size & PSEUDOVECTOR_SIZE_MASK)
+          == FONT_ENTITY_MAX)
+        android_finalize_font_entity (PSEUDOVEC_STRUCT (vector, font_entity));
+#endif
     }
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_THREAD))
     finalize_one_thread (PSEUDOVEC_STRUCT (vector, thread_state));
@@ -6467,6 +6475,10 @@ garbage_collect (void)
   mark_xselect ();
 #endif
 
+#ifdef HAVE_ANDROID
+  mark_androidterm ();
+#endif
+
 #ifdef HAVE_NS
   mark_nsterm ();
 #endif