From 89ecc43d8f2529fcfa422a91681ba89896a2b19e Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Mon, 13 May 2019 23:09:10 +0300
Subject: [PATCH] SDL: fixed crash on Android 4

---
 project/java/MainActivity.java | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index 630581c25..c1e371d5c 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -1187,6 +1187,15 @@ public class MainActivity extends Activity
 			Log.i("SDL", "libSDL: Cannot load GLESv3 or GLESv2 lib");
 		}
 
+		String [] SupportedAbis = { android.os.Build.CPU_ABI };
+		if (android.os.Build.CPU_ABI2 != null && !android.os.Build.CPU_ABI2.equals(""))
+		{
+			SupportedAbis = new String [] { android.os.Build.CPU_ABI, android.os.Build.CPU_ABI2 };
+		}
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP)
+		{
+			SupportedAbis = android.os.Build.SUPPORTED_ABIS;
+		}
 		// Load all libraries
 		try
 		{
@@ -1233,17 +1242,14 @@ public class MainActivity extends Activity
 		}
 		catch( IOException eeeeeeeee ) {}
 
-		String [] binaryZipNames = { "binaries-" + android.os.Build.CPU_ABI + ".zip", "binaries-" + android.os.Build.CPU_ABI2 + ".zip", "binaries.zip" };
-		if ( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP )
+		ArrayList<String> a = new ArrayList<String>();
+		for( String arch: SupportedAbis )
 		{
-			ArrayList<String> a = new ArrayList<String>();
-			for( String arch: android.os.Build.SUPPORTED_ABIS )
-			{
-				a.add("binaries-" + arch + ".zip");
-			}
-			a.add("binaries.zip");
-			binaryZipNames = a.toArray(new String[0]);
+			a.add("binaries-" + arch + ".zip");
 		}
+		a.add("binaries.zip");
+		String [] binaryZipNames = a.toArray(new String[0]);
+
 		for( String binaryZip: binaryZipNames )
 		{
 			try {
@@ -1259,7 +1265,7 @@ public class MainActivity extends Activity
 
 				if( binaryZip.equals("binaries.zip") )
 				{
-					for( String arch: android.os.Build.SUPPORTED_ABIS )
+					for( String arch: SupportedAbis )
 					{
 						try
 						{
@@ -1280,9 +1286,11 @@ public class MainActivity extends Activity
 				ZipInputStream zip = new ZipInputStream(in);
 
 				File libDir = getFilesDir();
-				try {
+				try
+				{
 					libDir.mkdirs();
-				} catch( SecurityException ee ) { };
+				}
+				catch( SecurityException ee ) { };
 				
 				byte[] buf = new byte[16384];
 				while(true)