diff options
| author | Tor Andersson <tor@ccxvii.net> | 2018-09-26 14:56:29 +0200 |
|---|---|---|
| committer | Tor Andersson <tor@ccxvii.net> | 2018-09-26 14:56:33 +0200 |
| commit | bef95b0b05c2a94b01a57a4dff62eb77ee02ceb3 (patch) | |
| tree | 286f05fbab5765393a5c6744bf45fb54033ae6c3 | |
| parent | f91d0723dbfa62250f4e1b81c159ba36fc495c08 (diff) | |
| download | mupdf-bef95b0b05c2a94b01a57a4dff62eb77ee02ceb3.tar.xz | |
Update Android build.
| -rw-r--r-- | platform/java/Android.mk | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/platform/java/Android.mk b/platform/java/Android.mk index d91c9353..09b94ce1 100644 --- a/platform/java/Android.mk +++ b/platform/java/Android.mk @@ -87,6 +87,7 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_C_INCLUDES := \ $(MUPDF_PATH)/include \ + $(MUPDF_PATH)/include/mupdf \ $(MUPDF_PATH)/scripts/freetype \ $(MUPDF_PATH)/scripts/libjpeg \ $(MUPDF_PATH)/thirdparty/freetype/include \ @@ -112,7 +113,7 @@ LOCAL_CFLAGS += \ LOCAL_CPPFLAGS := \ -ffunction-sections -fdata-sections \ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden \ - -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT \ + -DHAVE_FALLBACK=1 -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT \ -Dhb_malloc_impl=fz_hb_malloc \ -Dhb_calloc_impl=fz_hb_calloc \ -Dhb_realloc_impl=fz_hb_realloc \ @@ -125,11 +126,10 @@ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftbase.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftbbox.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftbitmap.c \ - $(MUPDF_PATH)/thirdparty/freetype/src/base/ftfntfmt.c \ + $(MUPDF_PATH)/thirdparty/freetype/src/base/ftdebug.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftgasp.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftglyph.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftinit.c \ - $(MUPDF_PATH)/thirdparty/freetype/src/base/ftlcdfil.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftstroke.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftsynth.c \ $(MUPDF_PATH)/thirdparty/freetype/src/base/ftsystem.c \ @@ -146,6 +146,7 @@ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/freetype/src/type1/type1.c \ LOCAL_SRC_FILES += \ + $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-aat-layout.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-blob.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-buffer-serialize.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-buffer.cc \ @@ -154,15 +155,19 @@ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-fallback-shape.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-font.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ft.cc \ + $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-color.cc \ + $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-face.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-font.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-layout.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-map.cc \ + $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-math.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-arabic.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-default.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-hangul.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-hebrew.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-indic-table.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-indic.cc \ + $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-khmer.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-myanmar.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-thai.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-complex-tibetan.cc \ @@ -172,10 +177,12 @@ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape-normalize.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-shape.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-tag.cc \ + $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ot-var.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-set.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-shape-plan.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-shape.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-shaper.cc \ + $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-static.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-ucdn.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-unicode.cc \ $(MUPDF_PATH)/thirdparty/harfbuzz/src/hb-warning.cc \ @@ -273,7 +280,7 @@ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/mqc.c \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/openjpeg.c \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/pi.c \ - $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/raw.c \ + $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/sparse_array.c \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/t1.c \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/t2.c \ $(MUPDF_PATH)/thirdparty/openjpeg/src/lib/openjp2/tcd.c \ |