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/Core2.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/Core2.mk')
-rw-r--r-- | platform/android/jni/Core2.mk | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/platform/android/jni/Core2.mk b/platform/android/jni/Core2.mk deleted file mode 100644 index b08751fe..00000000 --- a/platform/android/jni/Core2.mk +++ /dev/null @@ -1,45 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -MY_ROOT := ../.. - -V8 := v8-3.9 - -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 -ifdef MEMENTO -LOCAL_CFLAGS += -DMEMENTO -DMEMENTO_LEAKONLY -endif - -LOCAL_C_INCLUDES := \ - ../thirdparty/jbig2dec \ - ../thirdparty/openjpeg/src/lib/openjp2 \ - ../thirdparty/jpeg \ - ../thirdparty/zlib \ - ../thirdparty/freetype/include \ - ../draw \ - ../fitz \ - ../pdf \ - ../xps \ - ../cbz \ - ../ucdn \ - ../scripts \ - .. -ifdef V8_BUILD -LOCAL_C_INCLUDES += ../thirdparty/$(V8)/include -endif - -LOCAL_MODULE := mupdfcore2 -LOCAL_SRC_FILES := \ - $(MY_ROOT)/fitz/res_shade.c - -LOCAL_LDLIBS := -lm -llog -ljnigraphics - -include $(BUILD_STATIC_LIBRARY) |