SDL: Extract binaries-<ARCH>-pie.zip for Lollipop and newer, then try binaries-<ARCH>.zip

This commit is contained in:
Sergii Pylypenko
2015-01-13 22:10:27 +02:00
parent cad2353c79
commit 3a5d384ad2
4 changed files with 12 additions and 8 deletions

View File

@@ -1096,8 +1096,9 @@ public class MainActivity extends Activity
}
}
// ----- VCMI hack -----
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 )
binaryZipNames = new String[] { "binaries-" + android.os.Build.CPU_ABI + "-pie.zip", "binaries-" + android.os.Build.CPU_ABI2 + "-pie.zip", "binaries-" + android.os.Build.CPU_ABI + ".zip", "binaries-" + android.os.Build.CPU_ABI2 + ".zip", "binaries.zip" };
for(String binaryZip: binaryZipNames)
{
try {
@@ -1203,7 +1204,6 @@ public class MainActivity extends Activity
//Log.i("SDL", "libSDL: Error: " + eee.toString());
}
}
// ----- VCMI hack -----
};
public static void LoadApplicationLibrary(final Context context)