diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2014-03-21 16:31:38 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2014-03-25 16:44:48 +0000 |
| commit | 56585e87d5154b667e37e1b7e262122ea633c73b (patch) | |
| tree | b7e2a3b240720f4d9d1b96b8eaf0c1f66e1e0ba6 | |
| parent | f84e03a6c430c0edc2e9f466bfa3bd0066d086bf (diff) | |
| download | mupdf-56585e87d5154b667e37e1b7e262122ea633c73b.tar.xz | |
Use MuJS in Android build.
| -rw-r--r-- | platform/android/jni/Android.mk | 3 | ||||
| -rw-r--r-- | platform/android/jni/Core.mk | 15 | ||||
| -rw-r--r-- | platform/android/jni/ThirdParty.mk | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/platform/android/jni/Android.mk b/platform/android/jni/Android.mk index 32ae0fe0..d7ce897f 100644 --- a/platform/android/jni/Android.mk +++ b/platform/android/jni/Android.mk @@ -28,9 +28,6 @@ else endif LOCAL_LDLIBS := -lm -llog -ljnigraphics -ifdef V8_BUILD -LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/v8-3.9/android -lv8_$(TARGET_ARCH_ABI) -endif ifdef SSL_BUILD LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/openssl/android -lcrypto -lssl endif diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk index 58ac8477..71ebb8e7 100644 --- a/platform/android/jni/Core.mk +++ b/platform/android/jni/Core.mk @@ -4,8 +4,6 @@ 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 @@ -24,6 +22,7 @@ LOCAL_C_INCLUDES := \ ../../thirdparty/jbig2dec \ ../../thirdparty/openjpeg/libopenjpeg \ ../../thirdparty/jpeg \ + ../../thirdparty/mujs \ ../../thirdparty/zlib \ ../../thirdparty/freetype/include \ ../../source/fitz \ @@ -54,17 +53,11 @@ LOCAL_SRC_FILES := \ $(wildcard $(MY_ROOT)/source/cbz/*.c) \ $(wildcard $(MY_ROOT)/source/img/*.c) \ $(wildcard $(MY_ROOT)/source/tiff/*.c) -ifdef MEMENTO -LOCAL_SRC_FILES += $(MY_ROOT)/fitz/memento.c -endif -ifdef V8_BUILD LOCAL_SRC_FILES += \ $(MY_ROOT)/source/pdf/js/pdf-js.c \ - $(MY_ROOT)/source/pdf/js/pdf-jsimp-cpp.c \ - $(MY_ROOT)/source/pdf/js/pdf-jsimp-v8.cpp -else -LOCAL_SRC_FILES += \ - $(MY_ROOT)/source/pdf/js/pdf-js-none.c + $(MY_ROOT)/source/pdf/js/pdf-jsimp-mu.cpp +ifdef MEMENTO +LOCAL_SRC_FILES += $(MY_ROOT)/fitz/memento.c endif LOCAL_LDLIBS := -lm -llog -ljnigraphics diff --git a/platform/android/jni/ThirdParty.mk b/platform/android/jni/ThirdParty.mk index 72745494..91c6db18 100644 --- a/platform/android/jni/ThirdParty.mk +++ b/platform/android/jni/ThirdParty.mk @@ -8,6 +8,7 @@ LOCAL_C_INCLUDES := \ ../../thirdparty/jbig2dec \ ../../thirdparty/openjpeg/libopenjpeg \ ../../thirdparty/jpeg \ + ../../thirdparty/mujs \ ../../thirdparty/zlib \ ../../thirdparty/freetype/include \ ../../scripts/freetype \ @@ -28,6 +29,7 @@ endif LOCAL_MODULE := mupdfthirdparty LOCAL_SRC_FILES := \ + $(MY_ROOT)/thirdparty/mujs/one.c \ $(MY_ROOT)/thirdparty/jbig2dec/jbig2.c \ $(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith.c \ $(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith_iaid.c \ |