diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-04-09 17:03:04 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-04-09 18:10:43 +0100 |
| commit | e2ed04036139a569e454468a120d6892dfb02d24 (patch) | |
| tree | d92d6f09fd95ed5ef21479b4ad1be94453688ef0 /android | |
| parent | 2e3fcbaf6b0c71e178a681476dc1b997b3bd1bbe (diff) | |
| download | mupdf-e2ed04036139a569e454468a120d6892dfb02d24.tar.xz | |
Disable V8 usage on armeabi - only for armeabi-v7a for now.
Until someone can get me v8 libs that work on armeabi at least!
Diffstat (limited to 'android')
| -rw-r--r-- | android/jni/Android.mk | 5 | ||||
| -rw-r--r-- | android/jni/Core.mk | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 882404fa..a6b3dcf9 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -29,7 +29,12 @@ endif LOCAL_LDLIBS := -lm -llog -ljnigraphics ifdef V8_BUILD +ifeq ($(TARGET_ARCH_ABI),"armeabi") +V8_OK := 0 +else +V8_OK := 1 LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/v8-3.9/android -lv8_base -lv8_snapshot endif +endif include $(BUILD_SHARED_LIBRARY) diff --git a/android/jni/Core.mk b/android/jni/Core.mk index 3eb61a34..fb889b57 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -141,6 +141,7 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/xps/xps_zip.c \ $(MY_ROOT)/cbz/mucbz.c ifdef V8_BUILD +ifeq ($(V8_OK),1) LOCAL_SRC_FILES += \ $(MY_ROOT)/pdf/pdf_js.c \ $(MY_ROOT)/pdf/pdf_jsimp_cpp.c \ @@ -149,6 +150,10 @@ else LOCAL_SRC_FILES += \ $(MY_ROOT)/pdf/pdf_js_none.c endif +else +LOCAL_SRC_FILES += \ + $(MY_ROOT)/pdf/pdf_js_none.c +endif LOCAL_LDLIBS := -lm -llog -ljnigraphics |