mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 01:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Android) Some preliminary changes for new libretro core naming convention - still not"

Browse Source 
This reverts commit 1bcf1afc9ed167854ce4c4ee0f31abf7a59c9092.

Conflicts:
	android/phoenix/src/org/retroarch/browser/CoreSelection.java
This commit is contained in:
twinaphex 2013-10-10 16:49:27 +02:00
parent 6f0018b16e
commit 33de14a6ca
1 changed files with 0 additions and 3 deletions

3
android/phoenix/src/org/retroarch/browser/CoreSelection.java

@ -48,9 +48,7 @@ public final class CoreSelection extends ListActivity {
for (final File lib : libs) { for (final File lib : libs) {
String libName = lib.getName(); String libName = lib.getName();
<<<<<<< HEAD
Log.i(TAG, "Libretro core: " + libName); Log.i(TAG, "Libretro core: " + libName);
=======
// Never append a NEON lib if we don't have NEON. // Never append a NEON lib if we don't have NEON.
if (libName.contains("neon") && !cpuIsNeon) if (libName.contains("neon") && !cpuIsNeon)
continue; continue;
@ -72,7 +70,6 @@ public final class CoreSelection extends ListActivity {
if (hasNeonVersion) if (hasNeonVersion)
continue; continue;
} }
>>>>>>> parent of 1bcf1af... (Android) Some preliminary changes for new libretro core naming convention - still not
// Allow both libretro-core.so and libretro_core.so. // Allow both libretro-core.so and libretro_core.so.
if (libName.startsWith("libretro") if (libName.startsWith("libretro")