diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-09-13 17:34:44 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-09-13 17:48:11 +0100 |
| commit | 725a38a601e17d493f8d48140f6a31badfa38f3e (patch) | |
| tree | 0078a4422b6f70327b6842eee165594674725d67 /platform/android | |
| parent | 9c592542ecf76de64655e068132369c907b4f856 (diff) | |
| download | mupdf-725a38a601e17d493f8d48140f6a31badfa38f3e.tar.xz | |
Update MuPDF Android build for Memento.
Call Memento_fin rather than piecemeal functions to
ensure we get full details when available.
Ensure we link with the required lib for backtracing to
work in Memento builds.
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/viewer/jni/Application.mk | 1 | ||||
| -rw-r--r-- | platform/android/viewer/jni/mupdf.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/viewer/jni/Application.mk b/platform/android/viewer/jni/Application.mk index 4cedaf8d..d0c02018 100644 --- a/platform/android/viewer/jni/Application.mk +++ b/platform/android/viewer/jni/Application.mk @@ -40,6 +40,7 @@ APP_STL := stlport_static endif ifdef MEMENTO APP_CFLAGS += -DMEMENTO -DMEMENTO_LEAKONLY +APP_STL = gnustl_static endif # If the ndk is r8b then workaround bug by uncommenting the following line diff --git a/platform/android/viewer/jni/mupdf.c b/platform/android/viewer/jni/mupdf.c index 9eabc243..4f3b31f7 100644 --- a/platform/android/viewer/jni/mupdf.c +++ b/platform/android/viewer/jni/mupdf.c @@ -1784,8 +1784,7 @@ JNI_FN(MuPDFCore_destroying)(JNIEnv * env, jobject thiz) free(glo); #ifdef MEMENTO LOGI("Destroying dump start"); - Memento_listBlocks(); - Memento_stats(); + Memento_fin(); LOGI("Destroying dump end"); #endif #ifdef NDK_PROFILER |