diff options
| author | est31 <MTest31@outlook.com> | 2015-07-29 11:54:27 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-07-29 15:59:06 +0200 |
| commit | eb3aac20c879b9532cd3b678efb2126adcd07af7 (patch) | |
| tree | 93ebffb360dcc45fdd687519cd054926c14cc743 /build/android/jni | |
| parent | f97c2702a2fee9496059169448ce97ed2b7da9b2 (diff) | |
| download | minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.tar.gz minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.tar.bz2 minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.zip | |
Android: fix horrible libiconv build
Before, our libiconv build was a joke. We first called configure for our own build host system,
then called make, before we executed a Android.mk script we provided as patch. The first "native make"
always failed, and the LIBICONV_LIB file setting in our Makefile didn't match the built one,
resulting in an always-rebuild of iconv.
This commit cleans up this total mess, removes the double-build, and the Android.mk, and properly calls
./configure with the according target platform, and uses a built toolchain.
As we have to deal with the android bug "NDK: Support for prebuild libs with full sonames"
https://code.google.com/p/android/issues/detail?id=55868
as the 2013 patch
https://lists.gnu.org/archive/html/libtool-patches/2013-06/msg00002.html
by Google's David Turner wasn't inside the 2011 libtool, we pass -avoid-version to
libtool.
Thanks to the proper build, wide_to_utf8 works for android now, removing us of the need to disable it.
Diffstat (limited to 'build/android/jni')
| -rw-r--r-- | build/android/jni/Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 332677b84..61ba1d0f0 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -26,8 +26,8 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := iconv -LOCAL_SRC_FILES := deps/libiconv/obj/local/$(TARGET_ARCH_ABI)/libiconv.a -include $(PREBUILT_STATIC_LIBRARY) +LOCAL_SRC_FILES := deps/libiconv/lib/.libs/libiconv.so +include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := openal @@ -355,8 +355,8 @@ LOCAL_SRC_FILES += \ # json LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp -LOCAL_SHARED_LIBRARIES := openal ogg vorbis gmp -LOCAL_STATIC_LIBRARIES := Irrlicht iconv freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) +LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp +LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) ifeq ($(HAVE_LEVELDB), 1) LOCAL_STATIC_LIBRARIES += LevelDB |