From 33de14a6cae8d737bcb33a7bcd8ee3317f8eedf4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 10 Oct 2013 16:49:27 +0200 Subject: [PATCH] Revert "(Android) Some preliminary changes for new libretro core naming convention - still not" This reverts commit 1bcf1afc9ed167854ce4c4ee0f31abf7a59c9092. Conflicts: android/phoenix/src/org/retroarch/browser/CoreSelection.java --- android/phoenix/src/org/retroarch/browser/CoreSelection.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/CoreSelection.java b/android/phoenix/src/org/retroarch/browser/CoreSelection.java index c6dfeaeb58..59bcdab638 100644 --- a/android/phoenix/src/org/retroarch/browser/CoreSelection.java +++ b/android/phoenix/src/org/retroarch/browser/CoreSelection.java @@ -48,9 +48,7 @@ public final class CoreSelection extends ListActivity { for (final File lib : libs) { String libName = lib.getName(); -<<<<<<< HEAD Log.i(TAG, "Libretro core: " + libName); -======= // Never append a NEON lib if we don't have NEON. if (libName.contains("neon") && !cpuIsNeon) continue; @@ -72,7 +70,6 @@ public final class CoreSelection extends ListActivity { if (hasNeonVersion) 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. if (libName.startsWith("libretro")