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.

7 files changed, 391 insertions, 0 deletions

diff --git a/build/android/patches/irrlicht-back_button.patch b/build/android/patches/irrlicht-back_button.patch
new file mode 100644
index 000000000..227749ba7
--- /dev/null
+++ b/build/android/patches/irrlicht-back_button.patch
@@ -0,0 +1,19 @@
+--- irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2014-06-03 20:56:21.289559503 +0200
++++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp.orig	2014-06-03 20:57:39.281556749 +0200
+@@ -423,6 +423,7 @@
+ 			}

+ 			

+ 			device->postEventFromUser(event);

++			status = 1;

+ 		}

+ 		break;

+ 		default:

+@@ -479,7 +480,7 @@
+     KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT

+     KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT

+     KeyMap[3] = KEY_HOME; // AKEYCODE_HOME

+-    KeyMap[4] = KEY_BACK; // AKEYCODE_BACK

++    KeyMap[4] = KEY_CANCEL; // AKEYCODE_BACK

+     KeyMap[5] = KEY_UNKNOWN; // AKEYCODE_CALL

+     KeyMap[6] = KEY_UNKNOWN; // AKEYCODE_ENDCALL

+     KeyMap[7] = KEY_KEY_0; // AKEYCODE_0

diff --git a/build/android/patches/irrlicht-texturehack.patch b/build/android/patches/irrlicht-texturehack.patch
new file mode 100644
index 000000000..a458ede72
--- /dev/null
+++ b/build/android/patches/irrlicht-texturehack.patch
@@ -0,0 +1,240 @@
+--- irrlicht/source/Irrlicht/COGLESTexture.cpp.orig	2014-06-22 17:01:13.266568869 +0200
++++ irrlicht/source/Irrlicht/COGLESTexture.cpp	2014-06-22 17:03:59.298572810 +0200
+@@ -366,112 +366,140 @@
+ 	void(*convert)(const void*, s32, void*) = 0;

+ 	getFormatParameters(ColorFormat, InternalFormat, filtering, PixelFormat, PixelType, convert);

+ 

+-	// make sure we don't change the internal format of existing images

+-	if (!newTexture)

+-		InternalFormat = oldInternalFormat;

+-

+-    Driver->setActiveTexture(0, this);

+-

+-	if (Driver->testGLError())

+-		os::Printer::log("Could not bind Texture", ELL_ERROR);

+-

+-	// mipmap handling for main texture

+-	if (!level && newTexture)

+-	{

+-		// auto generate if possible and no mipmap data is given

+-		if (!IsCompressed && HasMipMaps && !mipmapData && Driver->queryFeature(EVDF_MIP_MAP_AUTO_UPDATE))

+-		{

+-			if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED))

+-				glHint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);

+-			else if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_QUALITY))

+-				glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);

+-			else

+-				glHint(GL_GENERATE_MIPMAP_HINT, GL_DONT_CARE);

++	bool retry = false;

++	

++	do { 

++		if (retry) {

++			InternalFormat = GL_RGBA;

++			PixelFormat = GL_RGBA;

++			convert = CColorConverter::convert_A8R8G8B8toA8B8G8R8;

++ 		}

++		// make sure we don't change the internal format of existing images

++		if (!newTexture)

++			InternalFormat = oldInternalFormat;

+ 

+-            glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);

+-			AutomaticMipmapUpdate=true;

+-		}

++		Driver->setActiveTexture(0, this);

+ 

+-		// enable bilinear filter without mipmaps

+-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);

+-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);

+-	}

++		if (Driver->testGLError())

++			os::Printer::log("Could not bind Texture", ELL_ERROR);

+ 

+-	// now get image data and upload to GPU

++		// mipmap handling for main texture

++		if (!level && newTexture)

++		{

++			// auto generate if possible and no mipmap data is given

++			if (!IsCompressed && HasMipMaps && !mipmapData && Driver->queryFeature(EVDF_MIP_MAP_AUTO_UPDATE))

++			{

++				if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED))

++					glHint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);

++				else if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_QUALITY))

++					glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);

++				else

++					glHint(GL_GENERATE_MIPMAP_HINT, GL_DONT_CARE);

++

++				glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);

++				AutomaticMipmapUpdate=true;

++			}

++

++			// enable bilinear filter without mipmaps

++			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);

++			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);

++		}

+ 

+-	u32 compressedImageSize = IImage::getCompressedImageSize(ColorFormat, image->getDimension().Width, image->getDimension().Height);

++		// now get image data and upload to GPU

+ 

+-	void* source = image->lock();

++		u32 compressedImageSize = IImage::getCompressedImageSize(ColorFormat, image->getDimension().Width, image->getDimension().Height);

+ 

+-	IImage* tmpImage = 0;

++		void* source = image->lock();

+ 

+-	if (convert)

+-	{

+-		tmpImage = new CImage(image->getColorFormat(), image->getDimension());

+-		void* dest = tmpImage->lock();

+-		convert(source, image->getDimension().getArea(), dest);

+-		image->unlock();

+-		source = dest;

+-	}

++		IImage* tmpImage = 0;

+ 

+-	if (newTexture)

+-	{

+-		if (IsCompressed)

++		if (convert)

+ 		{

+-			glCompressedTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, image->getDimension().Width,

+-				image->getDimension().Height, 0, compressedImageSize, source);

++			tmpImage = new CImage(image->getColorFormat(), image->getDimension());

++			void* dest = tmpImage->lock();

++			convert(source, image->getDimension().getArea(), dest);

++			image->unlock();

++			source = dest;

+ 		}

+-		else

+-			glTexImage2D(GL_TEXTURE_2D, level, InternalFormat, image->getDimension().Width,

+-				image->getDimension().Height, 0, PixelFormat, PixelType, source);

+-	}

+-	else

+-	{

+-		if (IsCompressed)

++

++		if (newTexture)

+ 		{

+-			glCompressedTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,

+-				image->getDimension().Height, PixelFormat, compressedImageSize, source);

++			if (IsCompressed)

++			{

++				glCompressedTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, image->getDimension().Width,

++					image->getDimension().Height, 0, compressedImageSize, source);

++			}

++			else

++				glTexImage2D(GL_TEXTURE_2D, level, InternalFormat, image->getDimension().Width,

++					image->getDimension().Height, 0, PixelFormat, PixelType, source);

+ 		}

+ 		else

+-			glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,

+-				image->getDimension().Height, PixelFormat, PixelType, source);

+-	}

+-

+-	if (convert)

+-	{

+-		tmpImage->unlock();

+-		tmpImage->drop();

+-	}

+-	else

+-		image->unlock();

+-

+-	if (!level && newTexture)

+-	{

+-		if (IsCompressed && !mipmapData)

+ 		{

+-			if (image->hasMipMaps())

+-				mipmapData = static_cast<u8*>(image->lock())+compressedImageSize;

++			if (IsCompressed)

++			{

++				glCompressedTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,

++					image->getDimension().Height, PixelFormat, compressedImageSize, source);

++			}

+ 			else

+-				HasMipMaps = false;

++				glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, image->getDimension().Width,

++					image->getDimension().Height, PixelFormat, PixelType, source);

+ 		}

+ 

+-		regenerateMipMapLevels(mipmapData);

+-

+-		if (HasMipMaps) // might have changed in regenerateMipMapLevels

++		if (convert)

+ 		{

+-			// enable bilinear mipmap filter

+-			GLint filteringMipMaps = GL_LINEAR_MIPMAP_NEAREST;

+-

+-			if (filtering != GL_LINEAR)

+-				filteringMipMaps = GL_NEAREST_MIPMAP_NEAREST;

++			tmpImage->unlock();

++			tmpImage->drop();

++		}

++		else

++			image->unlock();

++		

++		if (glGetError() != GL_NO_ERROR) {

++			static bool warned = false;

++			if ((!retry) && (ColorFormat == ECF_A8R8G8B8)) {

++

++				if (!warned) {

++					os::Printer::log("Your driver claims to support GL_BGRA but fails on trying to upload a texture, converting to GL_RGBA and trying again", ELL_ERROR);

++					warned = true;

++				}

++			}

++			else if (retry) {

++				os::Printer::log("Neither uploading texture as GL_BGRA nor, converted one using GL_RGBA succeeded", ELL_ERROR);

++			}

++			retry = !retry;

++			continue;

++		} else {

++			retry = false;

++		}

+ 

+-			glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filteringMipMaps);

+-			glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);

++		if (!level && newTexture)

++		{

++			if (IsCompressed && !mipmapData)

++			{

++				if (image->hasMipMaps())

++					mipmapData = static_cast<u8*>(image->lock())+compressedImageSize;

++				else

++					HasMipMaps = false;

++			}

++

++			regenerateMipMapLevels(mipmapData);

++

++			if (HasMipMaps) // might have changed in regenerateMipMapLevels

++			{

++				// enable bilinear mipmap filter

++				GLint filteringMipMaps = GL_LINEAR_MIPMAP_NEAREST;

++

++				if (filtering != GL_LINEAR)

++					filteringMipMaps = GL_NEAREST_MIPMAP_NEAREST;

++

++				glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filteringMipMaps);

++				glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);

++			}

+ 		}

+-	}

+ 

+-	if (Driver->testGLError())

+-		os::Printer::log("Could not glTexImage2D", ELL_ERROR);

++		if (Driver->testGLError())

++			os::Printer::log("Could not glTexImage2D", ELL_ERROR);

++	}

++	while(retry);

+ }

+ 

+ 

+--- irrlicht/source/Irrlicht/COGLESTexture.cpp.orig	2014-06-25 00:28:50.820501856 +0200
++++ irrlicht/source/Irrlicht/COGLESTexture.cpp	2014-06-25 00:08:37.712544692 +0200
+@@ -422,6 +422,9 @@
+ 			source = dest;

+ 		}

+ 

++		//clear old error

++		glGetError();

++

+ 		if (newTexture)

+ 		{

+ 			if (IsCompressed)

diff --git a/build/android/patches/irrlicht-touchcount.patch b/build/android/patches/irrlicht-touchcount.patch
new file mode 100644
index 000000000..d4e4b9c3e
--- /dev/null
+++ b/build/android/patches/irrlicht-touchcount.patch
@@ -0,0 +1,30 @@
+--- irrlicht.orig/include/IEventReceiver.h	2014-06-03 19:43:50.433713133 +0200
++++ irrlicht/include/IEventReceiver.h	2014-06-03 19:44:36.993711489 +0200
+@@ -375,6 +375,9 @@
+         // Y position of simple touch.

+ 		s32 Y;

+ 

++		// number of current touches

++		s32 touchedCount;

++

+ 		//! Type of touch event.

+ 		ETOUCH_INPUT_EVENT Event;

+ 	};

+--- irrlicht.orig/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2014-06-03 19:43:50.505713130 +0200
++++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp	2014-06-03 19:45:37.265709359 +0200
+@@ -315,6 +315,7 @@
+ 						event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, i);

+ 						event.TouchInput.X = AMotionEvent_getX(androidEvent, i);

+ 						event.TouchInput.Y = AMotionEvent_getY(androidEvent, i);

++						event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent);

+ 

+ 						device->postEventFromUser(event);

+ 					}

+@@ -326,6 +327,7 @@
+ 					event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, pointerIndex);

+ 					event.TouchInput.X = AMotionEvent_getX(androidEvent, pointerIndex);

+ 					event.TouchInput.Y = AMotionEvent_getY(androidEvent, pointerIndex);

++					event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent);

+ 

+ 					device->postEventFromUser(event);

+ 				}

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
+ 
diff --git a/build/android/patches/libiconv_stdio.patch b/build/android/patches/libiconv_stdio.patch
new file mode 100644
index 000000000..9fa50f79a
--- /dev/null
+++ b/build/android/patches/libiconv_stdio.patch
@@ -0,0 +1,13 @@
+--- a/srclib/stdio.in.h	2011-08-07 15:42:06.000000000 +0200
++++ b/srclib/stdio.in.h	2015-06-10 09:27:58.129056262 +0200
+@@ -695,8 +696,9 @@ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/
++#define gets(a) fgets( a, sizeof(*(a)), stdin)
+ #endif
+
+
+#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/build/android/patches/libvorbis-libogg-fpu.patch b/build/android/patches/libvorbis-libogg-fpu.patch
new file mode 100644
index 000000000..52ab397ac
--- /dev/null
+++ b/build/android/patches/libvorbis-libogg-fpu.patch
@@ -0,0 +1,37 @@
+--- libvorbis-libogg-android/jni/libvorbis-jni/Android.mk.orig	2014-06-17 19:22:50.621559073 +0200
++++ libvorbis-libogg-android/jni/libvorbis-jni/Android.mk	2014-06-17 19:38:20.641581140 +0200
+@@ -4,9 +4,6 @@
+ 
+ LOCAL_MODULE := vorbis-jni
+ LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -fsigned-char
+-ifeq ($(TARGET_ARCH),arm)
+-	LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
+-endif
+ 
+ LOCAL_SHARED_LIBRARIES := libogg libvorbis
+ 
+--- libvorbis-libogg-android/jni/libvorbis/Android.mk.orig	2014-06-17 19:22:39.077558797 +0200
++++ libvorbis-libogg-android/jni/libvorbis/Android.mk	2014-06-17 19:38:52.121581887 +0200
+@@ -4,9 +4,6 @@
+ 
+ LOCAL_MODULE := libvorbis
+ LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -ffast-math -fsigned-char
+-ifeq ($(TARGET_ARCH),arm)
+-	LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
+-endif
+ LOCAL_SHARED_LIBRARIES := libogg
+ 
+ LOCAL_SRC_FILES := \
+--- libvorbis-libogg-android/jni/libogg/Android.mk.orig	2014-06-17 19:22:33.965558675 +0200
++++ libvorbis-libogg-android/jni/libogg/Android.mk	2014-06-17 19:38:25.337581252 +0200
+@@ -4,10 +4,6 @@
+ 
+ LOCAL_MODULE := libogg
+ LOCAL_CFLAGS += -I$(LOCAL_PATH)/../include -ffast-math -fsigned-char
+-ifeq ($(TARGET_ARCH),arm)
+-	LOCAL_CFLAGS += -march=armv6 -marm -mfloat-abi=softfp -mfpu=vfp
+-endif
+-
+ 
+ LOCAL_SRC_FILES := \
+ 	bitwise.c \
diff --git a/build/android/patches/openssl_arch.patch b/build/android/patches/openssl_arch.patch
new file mode 100644
index 000000000..d15e2b137
--- /dev/null
+++ b/build/android/patches/openssl_arch.patch
@@ -0,0 +1,13 @@
+--- openssl-1.0.2e.orig/Configure	2015-12-03 15:04:23.000000000 +0100
++++ openssl-1.0.2e/Configure	2015-12-14 21:01:40.351265968 +0100
+@@ -464,8 +464,10 @@
+ # Android: linux-* but without pointers to headers and libs.
+ "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-arm","gcc:-march=armv4 -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-mips32","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ #### *BSD [do see comment about ${BSDthreads} above!]
+ "BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",