diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:16:39 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:23:36 +0100 |
| commit | 82131246a46ed4547c978b0081d4e0db9d6f3942 (patch) | |
| tree | debd12abf0e2f5c3ce977e3813db7c0f7238fa31 /platform/android/jni/Application.mk | |
| parent | e2673a829b61d77d7884ecabac2424fdb28309e8 (diff) | |
| download | mupdf-82131246a46ed4547c978b0081d4e0db9d6f3942.tar.xz | |
Fix Android builds.
Had to rejig the thumb entry/exit veneers to allow for NDK_PROFILER
operation, but this seems to have negated the need for Core2.mk, so
removed that here.
Diffstat (limited to 'platform/android/jni/Application.mk')
| -rw-r--r-- | platform/android/jni/Application.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/platform/android/jni/Application.mk b/platform/android/jni/Application.mk index 8eb9c3b9..60909b6e 100644 --- a/platform/android/jni/Application.mk +++ b/platform/android/jni/Application.mk @@ -24,13 +24,9 @@ APP_ABI := armeabi-v7a 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 -# off, which is less than ideal. We COULD force them back on by using -# APP_CFLAGS = -O2, but this then triggers bugs in the compiler when it -# builds a couple of our source files. Accordingly, we have moved -# those files into Core2, and we have some flag hackery to make just that -# module without optimisation. +# off, which is less than ideal. APP_OPTIM := debug -APP_CFLAGS := +APP_CFLAGS := -O2 else APP_OPTIM := release endif |