summaryrefslogtreecommitdiff
path: root/build/android/patches/libiconv_android.patch
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2016-04-13 14:14:04 -0400
committerShadowNinja <shadowninja@minetest.net>2016-04-28 12:28:42 -0400
commite41673820ffe200df78b1ec185ccb9d9ca962ae1 (patch)
tree94c0fda8c113920eb07bc97d03c7c551f8b6146f /build/android/patches/libiconv_android.patch
parent7baddd173591cc9394d57cdb265f978495314f7a (diff)
downloadminetest-e41673820ffe200df78b1ec185ccb9d9ca962ae1.tar.gz
minetest-e41673820ffe200df78b1ec185ccb9d9ca962ae1.tar.bz2
minetest-e41673820ffe200df78b1ec185ccb9d9ca962ae1.zip
Upgrade Android build to Gradle build system
The old Ant build system has been deprecated for a while and new development is focused on Gradle. I also removed a hardcoded string that lint caught and moved the patch files to a subdirectory. I left the JNI files in the root directory.
Diffstat (limited to 'build/android/patches/libiconv_android.patch')
-rw-r--r--build/android/patches/libiconv_android.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/build/android/patches/libiconv_android.patch b/build/android/patches/libiconv_android.patch
new file mode 100644
index 000000000..4eca0a4ef
--- /dev/null
+++ b/build/android/patches/libiconv_android.patch
@@ -0,0 +1,39 @@
+--- a/libcharset/lib/localcharset.c 2015-06-10 11:55:25.933870724 +0200
++++ b/libcharset/lib/localcharset.c 2015-06-10 11:55:39.578063493 +0200
+@@ -47,7 +47,7 @@
+
+ #if !defined WIN32_NATIVE
+ # include <unistd.h>
+-# if HAVE_LANGINFO_CODESET
++# if HAVE_LANGINFO_CODESET && !(defined __ANDROID__)
+ # include <langinfo.h>
+ # else
+ # if 0 /* see comment below */
+@@ -124,7 +124,7 @@ get_charset_aliases (void)
+ cp = charset_aliases;
+ if (cp == NULL)
+ {
+-#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
++#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__ || defined __ANDROID__)
+ const char *dir;
+ const char *base = "charset.alias";
+ char *file_name;
+@@ -338,6 +338,9 @@ get_charset_aliases (void)
+ "CP54936" "\0" "GB18030" "\0"
+ "CP65001" "\0" "UTF-8" "\0";
+ # endif
++# if defined __ANDROID__
++ cp = "*" "\0" "UTF-8" "\0";
++# endif
+ #endif
+
+ charset_aliases = cp;
+@@ -361,7 +364,7 @@ locale_charset (void)
+ const char *codeset;
+ const char *aliases;
+
+-#if !(defined WIN32_NATIVE || defined OS2)
++#if !(defined WIN32_NATIVE || defined OS2 || defined __ANDROID__)
+
+ # if HAVE_LANGINFO_CODESET
+