diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-02-27 10:53:11 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-02-27 11:03:55 +0000 |
| commit | 963c5f195d44fd46d79c312f35dc3c4d623a8a16 (patch) | |
| tree | 987dbd655475e3f2383a8416b37a039f25139f4f /android | |
| parent | 0801ae6d1fda6f6dc4756cc1cc68b2eef904b5d2 (diff) | |
| download | mupdf-963c5f195d44fd46d79c312f35dc3c4d623a8a16.tar.xz | |
Android: Update *.mk files to allow for non-arm android builds.
We could do with non arm builds of v8 to go with these.
Diffstat (limited to 'android')
| -rw-r--r-- | android/jni/Application.mk | 6 | ||||
| -rw-r--r-- | android/jni/Core.mk | 5 | ||||
| -rw-r--r-- | android/jni/Core2.mk | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 4acb1d30..8fec4403 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,6 +1,12 @@ # The ARMv7 is significanly faster due to the use of the hardware FPU APP_PLATFORM=android-8 + +# We only build for arm variants by default. If you want more, uncomment +# the appropriate line below. APP_ABI := armeabi armeabi-v7a +#APP_ABI := armeabi armeabi-v7a x86 mips +#APP_ABI := all + ifdef NDK_PROFILER # The profiler doesn't seem to receive ticks when run on release code. # Accordingly, we need to build as debug - but this turns optimisations diff --git a/android/jni/Core.mk b/android/jni/Core.mk index c280b4b7..100b8185 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -10,10 +10,13 @@ ZLIB := zlib FREETYPE := freetype V8 := v8-3.9 -LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED -DAA_BITS=8 +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED ifdef NDK_PROFILER LOCAL_CFLAGS += -pg -DNDK_PROFILER -O2 endif +endif +LOCAL_CFLAGS += -DAA_BITS=8 LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ diff --git a/android/jni/Core2.mk b/android/jni/Core2.mk index 6816b3ab..b8239e18 100644 --- a/android/jni/Core2.mk +++ b/android/jni/Core2.mk @@ -10,11 +10,14 @@ ZLIB := zlib FREETYPE := freetype V8 := v8-3.9 -LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED -DAA_BITS=8 +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED ifdef NDK_PROFILER LOCAL_CFLAGS += -pg -DNDK_PROFILER -O0 NDK_APP_CFLAGS := endif +endif +LOCAL_CFLAGS += -DAA_BITS=8 LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ |