diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2016-11-16 01:40:34 +0800 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2016-11-17 01:19:11 +0800 |
| commit | 276d97cb194f4ed4cacfa44a3b6fba2c3c5cb84a (patch) | |
| tree | c95871724d3f1385eceb9147c90f608107816d24 /platform/android/viewer | |
| parent | 207b2a0fa3943bfb8d8c35e4202d2ef10e782bcb (diff) | |
| download | mupdf-276d97cb194f4ed4cacfa44a3b6fba2c3c5cb84a.tar.xz | |
Rename openssl flags to libcrypto.
Only libcrypto is used to do checking of digital signatures.
The SSL library openssl is never used.
Diffstat (limited to 'platform/android/viewer')
| -rw-r--r-- | platform/android/viewer/jni/Android.mk | 4 | ||||
| -rw-r--r-- | platform/android/viewer/jni/Core.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/viewer/jni/Android.mk b/platform/android/viewer/jni/Android.mk index 4e6038d4..857c9ba1 100644 --- a/platform/android/viewer/jni/Android.mk +++ b/platform/android/viewer/jni/Android.mk @@ -35,8 +35,8 @@ LOCAL_CFLAGS += -DFZ_ENABLE_GPRF endif LOCAL_LDLIBS := -lm -llog -ljnigraphics -ifdef SSL_BUILD -LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/openssl/android -lcrypto -lssl +ifdef CRYPTO_BUILD +LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/openssl/android -lcrypto endif include $(BUILD_SHARED_LIBRARY) diff --git a/platform/android/viewer/jni/Core.mk b/platform/android/viewer/jni/Core.mk index ca35e2a7..9f11aa5a 100644 --- a/platform/android/viewer/jni/Core.mk +++ b/platform/android/viewer/jni/Core.mk @@ -26,8 +26,8 @@ LOCAL_CFLAGS += -DAA_BITS=8 ifdef MEMENTO LOCAL_CFLAGS += -DMEMENTO -DMEMENTO_LEAKONLY endif -ifdef SSL_BUILD -LOCAL_CFLAGS += -DHAVE_OPENSSL +ifdef CRYPTO_BUILD +LOCAL_CFLAGS += -DHAVE_LIBCRYPTO endif LOCAL_C_INCLUDES := \ @@ -54,7 +54,7 @@ LOCAL_C_INCLUDES := \ ifdef V8_BUILD LOCAL_C_INCLUDES += $(MY_ROOT)/thirdparty/$(V8)/include endif -ifdef SSL_BUILD +ifdef CRYPTO_BUILD LOCAL_C_INCLUDES += $(MY_ROOT)/thirdparty/openssl/include endif |