···910910 // Allocate the server itself.
911911 struct ipc_server *s = U_TYPED_CALLOC(struct ipc_server);
912912913913- // need to create early before any vars are added
913913+ /*
914914+ * Need to create early before any vars are added. Not created in
915915+ * init_all since that function is shared with Android and the debug
916916+ * GUI isn't supported on Android.
917917+ */
914918 u_debug_gui_create(&s->debug_gui);
915919916920 int ret = init_all(s, log_level);
917921 if (ret < 0) {
918918- free(s->debug_gui);
922922+ u_debug_gui_stop(&s->debug_gui);
919923 free(s);
920924 return ret;
921925 }