diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-10-09 16:10:35 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-10-10 13:01:41 +0100 |
| commit | 0567433564717b0cc34efde669b7e7489e00d07c (patch) | |
| tree | c885386b539f42bad2457be9cf14bb7a90c04e12 /android | |
| parent | b674a68e91824e82f2930f47a4ee33ef2e66f5b0 (diff) | |
| download | mupdf-0567433564717b0cc34efde669b7e7489e00d07c.tar.xz | |
Fix Android build.
Files had been added to project, but not to android makefiles.
Thirdparty file paths needed updating in android makefiles.
Rebuilding with the latest ndk (r8b) shows a problem due to a
bug in the NDK. Work around this.
Diffstat (limited to 'android')
| -rw-r--r-- | android/ReadMe.txt | 9 | ||||
| -rw-r--r-- | android/jni/Application.mk | 3 | ||||
| -rw-r--r-- | android/jni/Core.mk | 9 | ||||
| -rw-r--r-- | android/jni/ThirdParty.mk | 8 |
4 files changed, 17 insertions, 12 deletions
diff --git a/android/ReadMe.txt b/android/ReadMe.txt index 2f4ba2a5..c3f33dea 100644 --- a/android/ReadMe.txt +++ b/android/ReadMe.txt @@ -13,11 +13,12 @@ on Macos an older version installed as: Whatever directory it unpacks to, ensure that both the 'tools' and 'platform-tools' directories inside it have been added to your PATH. -2) Download the android ndk, and unpack it. These instructions have been -written with r6b (the latest version at the time of writing) of the NDK -in mind; other versions may give problems. On windows I unpacked it as: +2) Download the android ndk, and unpack it. These instructions were written +with NDK r6b (the latest version at the time of writing) in mind, but the +build has now been tweaked to work with r8b. Other versions may give problems. +On windows I unpacked it as: - C:\android-ndk-r6b + C:\android-ndk-r8b on Macos an older version unpacked as: diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 580786f9..50e03f81 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -2,3 +2,6 @@ APP_PLATFORM=android-8 APP_ABI := armeabi armeabi-v7a APP_OPTIM := debug + +# Workaround bug in the ndk +NDK_TOOLCHAIN_VERSION=4.4.3 diff --git a/android/jni/Core.mk b/android/jni/Core.mk index fcfc3412..f1d309f3 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -4,10 +4,10 @@ include $(CLEAR_VARS) MY_ROOT := ../.. -OPENJPEG := openjpeg-1.5.0-patched -JPEG := jpeg-9 -ZLIB := zlib-1.2.7 -FREETYPE := freetype-2.4.10 +OPENJPEG := openjpeg +JPEG := jpeg +ZLIB := zlib +FREETYPE := freetype LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED @@ -66,6 +66,7 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/fitz/res_store.c \ $(MY_ROOT)/fitz/res_text.c \ $(MY_ROOT)/fitz/stm_buffer.c \ + $(MY_ROOT)/fitz/stm_comp_buf.c \ $(MY_ROOT)/fitz/stm_open.c \ $(MY_ROOT)/fitz/stm_read.c \ $(MY_ROOT)/draw/draw_affine.c \ diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk index a2d05ccf..e028c49d 100644 --- a/android/jni/ThirdParty.mk +++ b/android/jni/ThirdParty.mk @@ -4,10 +4,10 @@ include $(CLEAR_VARS) MY_ROOT := ../.. -OPENJPEG := openjpeg-1.5.0-patched -JPEG := jpeg-9 -ZLIB := zlib-1.2.7 -FREETYPE := freetype-2.4.10 +OPENJPEG := openjpeg +JPEG := jpeg +ZLIB := zlib +FREETYPE := freetype LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ |