 index ef4cd74d..6e6ea124 100644
 --- a/include/mupdf/fitz/font.h
 +++ b/include/mupdf/fitz/font.h
-@@ -624,4 +624,10 @@ void fz_hb_lock(fz_context *ctx);
+@@ -624,4 +624,9 @@ void fz_hb_lock(fz_context *ctx);
  */
  void fz_hb_unlock(fz_context *ctx);
  
 +char *get_font_file(char *name);
-+char *get_font_file_android(char *name);
 +char *fz_lookup_base14_font_from_file(fz_context *ctx, const char *name);
 +char *fz_lookup_cjk_font_from_file(fz_context *ctx, int registry, int serif, int wmode);
 +void fz_install_external_font_funcs(fz_context *ctx);

+char *
+fz_lookup_cjk_font_from_file(fz_context *ctx, int registry, int serif, int wmode)
+{
+#ifdef __ANDROID__
+	return get_font_file_android("Roboto-Regular.ttf");
+#else
+	return get_font_file("noto/NotoSansCJKsc-Regular.otf");
+#endif
+}
+
+const unsigned char *

+	return filename;
+}
+
+const unsigned char *
+fz_lookup_base14_font(fz_context *ctx, const char *name, int *size)
+{
