diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2019-01-04 16:41:42 +0100 |
|---|---|---|
| committer | Loïc Blot <loic.blot@unix-experience.fr> | 2019-01-04 16:45:37 +0100 |
| commit | 9854340c0b21d01a94ba7ef526c775e59e37b898 (patch) | |
| tree | edb0751e0b303d214c5e80a4b5f534583017daa7 /build/android/jni | |
| parent | 6b978f88e3c84ba55a2ef8fb0fbe1356aa13733f (diff) | |
| download | minetest-9854340c0b21d01a94ba7ef526c775e59e37b898.tar.gz minetest-9854340c0b21d01a94ba7ef526c775e59e37b898.tar.bz2 minetest-9854340c0b21d01a94ba7ef526c775e59e37b898.zip | |
Drop libgmp on Android and use mini-gmp (#8047)
Diffstat (limited to 'build/android/jni')
| -rw-r--r-- | build/android/jni/Android.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 0f5c885ac..a8e017510 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -45,11 +45,6 @@ LOCAL_SRC_FILES := deps/libvorbis-libogg-android/libs/$(TARGET_LIBDIR)/libvorbis include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := gmp -LOCAL_SRC_FILES := deps/gmp/usr/lib/libgmp.so -include $(PREBUILT_SHARED_LIBRARY) - -include $(CLEAR_VARS) LOCAL_MODULE := ssl LOCAL_SRC_FILES := deps/openssl/libssl.a include $(PREBUILT_STATIC_LIBRARY) @@ -98,6 +93,7 @@ endif LOCAL_C_INCLUDES := \ jni/src \ jni/src/script \ + jni/lib/gmp \ jni/lib/lua/src \ jni/lib/jsoncpp \ jni/src/cguittfont \ @@ -107,7 +103,6 @@ LOCAL_C_INCLUDES := \ deps/curl/include \ deps/openal-soft/jni/OpenAL/include \ deps/libvorbis-libogg-android/jni/include \ - deps/gmp/usr/include \ deps/leveldb/include \ deps/sqlite/ @@ -374,6 +369,9 @@ LOCAL_SRC_FILES += \ #freetype2 support #LOCAL_SRC_FILES += jni/src/cguittfont/xCGUITTFont.cpp +# GMP +LOCAL_SRC_FILES += jni/lib/gmp/mini-gmp.c + # Lua LOCAL_SRC_FILES += \ jni/lib/lua/src/lapi.c \ @@ -419,7 +417,7 @@ LOCAL_SRC_FILES += \ # JSONCPP LOCAL_SRC_FILES += jni/lib/jsoncpp/jsoncpp.cpp -LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp +LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) ifeq ($(HAVE_LEVELDB), 1) |