From 0742977a5efe85983ccd135c012d7c6884a69d05 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Fri, 22 Apr 2011 16:12:36 -0400
Subject: [PATCH] Fixed clashing lib names with system libraries

---
 project/java/MainActivity.java                    | 15 ++++++++++++++-
 .../application/ballfield/AndroidAppSettings.cfg  |  2 +-
 project/jni/application/src                       |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index e51712da8..60d22e605 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -45,6 +45,9 @@ import java.io.File;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import android.text.SpannedString;
+import java.io.BufferedReader;
+import java.io.BufferedInputStream;
+import java.io.InputStreamReader;
 
 
 public class MainActivity extends Activity {
@@ -409,7 +412,17 @@ public class MainActivity extends Activity {
 		{
 			for(String l : Globals.AppLibraries)
 			{
-				System.loadLibrary(l);
+				try
+				{
+					String libname = System.mapLibraryName(l);
+					File libpath = new File(getFilesDir().getAbsolutePath() + "/../lib/" + libname);
+					System.out.println("libSDL: loading lib " + libpath.getAbsolutePath());
+					System.load(libpath.getPath());
+				}
+				catch( UnsatisfiedLinkError e )
+				{
+					System.loadLibrary(l);
+				}
 			}
 		}
 		catch ( UnsatisfiedLinkError e )
diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg
index 6f96df13f..ce6d5ae81 100644
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -22,7 +22,7 @@ RedefinedKeys="SPACE"
 AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="1 2 3 4 5 6 1 2 3 4"
-MultiABI=n
+MultiABI=y
 AppVersionCode=101
 AppVersionName="1.01"
 CompiledLibraries="sdl_mixer sdl_image"
diff --git a/project/jni/application/src b/project/jni/application/src
index 550b7b622..104f796a6 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-openttd
\ No newline at end of file
+ballfield
\ No newline at end of file