summaryrefslogtreecommitdiff
path: root/build/android/jni/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'build/android/jni/Android.mk')
-rw-r--r--build/android/jni/Android.mk12
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)