diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2013-08-14 13:56:18 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2013-08-27 09:53:39 +0100 |
| commit | 57ceaf3fe8ea3c180d52d6c01b083bc293835664 (patch) | |
| tree | a2629da8f8629939fdf232e4fa9f86f608356abf | |
| parent | 34dfe07760e3d8547fa180e9ce3b3c639051b99d (diff) | |
| download | mupdf-57ceaf3fe8ea3c180d52d6c01b083bc293835664.tar.xz | |
Support openssl build in android
| -rw-r--r-- | platform/android/jni/Android.mk | 3 | ||||
| -rw-r--r-- | platform/android/jni/Core.mk | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/platform/android/jni/Android.mk b/platform/android/jni/Android.mk index 17389efc..32ae0fe0 100644 --- a/platform/android/jni/Android.mk +++ b/platform/android/jni/Android.mk @@ -31,5 +31,8 @@ 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 include $(BUILD_SHARED_LIBRARY) diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk index 727e9584..6432843e 100644 --- a/platform/android/jni/Core.mk +++ b/platform/android/jni/Core.mk @@ -16,6 +16,9 @@ LOCAL_CFLAGS += -DAA_BITS=8 ifdef MEMENTO LOCAL_CFLAGS += -DMEMENTO -DMEMENTO_LEAKONLY endif +ifdef SSL_BUILD +LOCAL_CFLAGS += -DHAVE_OPENSSL +endif LOCAL_C_INCLUDES := \ ../../thirdparty/jbig2dec \ @@ -36,6 +39,9 @@ LOCAL_C_INCLUDES := \ ifdef V8_BUILD LOCAL_C_INCLUDES += ../../thirdparty/$(V8)/include endif +ifdef SSL_BUILD +LOCAL_C_INCLUDES += ../../thirdparty/openssl/include +endif LOCAL_MODULE := mupdfcore LOCAL_SRC_FILES := \ |