diff options
| author | sapier <Sapier at GMX dot net> | 2015-01-05 00:48:33 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2015-01-05 00:51:35 +0100 |
| commit | a92c0830113e7a32d056fabd3cbd58cedbde684a (patch) | |
| tree | 20f68e78b962ac878947f4eee8fbaed9969ef93f /build/android/jni | |
| parent | cd4d213ae07724b698d8a37f4dfe83f82f0fc6e8 (diff) | |
| download | minetest-a92c0830113e7a32d056fabd3cbd58cedbde684a.tar.gz minetest-a92c0830113e7a32d056fabd3cbd58cedbde684a.tar.bz2 minetest-a92c0830113e7a32d056fabd3cbd58cedbde684a.zip | |
Fix broken android version due to new openssl not linking correct to curl
Diffstat (limited to 'build/android/jni')
| -rw-r--r-- | build/android/jni/Android.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index b1cb9a382..cae0687e2 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -41,13 +41,13 @@ include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ssl -LOCAL_SRC_FILES := deps/openssl/libssl.so -include $(PREBUILT_SHARED_LIBRARY) +LOCAL_SRC_FILES := deps/openssl/libssl.a +include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := crypto -LOCAL_SRC_FILES := deps/openssl/libcrypto.so -include $(PREBUILT_SHARED_LIBRARY) +LOCAL_SRC_FILES := deps/openssl/libcrypto.a +include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -302,8 +302,8 @@ LOCAL_SRC_FILES += \ # json LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp -LOCAL_SHARED_LIBRARIES := openal ogg vorbis ssl crypto -LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl android_native_app_glue $(PROFILER_LIBS) +LOCAL_SHARED_LIBRARIES := openal ogg vorbis +LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) ifeq ($(HAVE_LEVELDB), 1) LOCAL_STATIC_LIBRARIES += LevelDB |