From 9e4b672634521c5d46bab0ecf392d7239bc3ac78 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 30 Oct 2013 01:07:49 +0100 Subject: [PATCH] Move cores to an 'asset' folder - create a directory in phoenix/assets folder, call it 'cores', move all the cores there. The APK extract and retroarch activity libraries still need to remain in phoenix/libs. This will allow Lioncash to make his core manager be able to uninstall cores etc. --- android/phoenix/src/org/retroarch/browser/CoreSelection.java | 5 ++--- .../phoenix/src/org/retroarch/browser/MainMenuActivity.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/CoreSelection.java b/android/phoenix/src/org/retroarch/browser/CoreSelection.java index 36d4a14832..8bafde4341 100644 --- a/android/phoenix/src/org/retroarch/browser/CoreSelection.java +++ b/android/phoenix/src/org/retroarch/browser/CoreSelection.java @@ -44,8 +44,7 @@ public final class CoreSelection extends ListActivity { setTitle(R.string.select_libretro_core); // Populate the list - final String modulePath = getApplicationInfo().nativeLibraryDir; - final File[] libs = new File(modulePath).listFiles(); + final File[] libs = new File(getApplicationInfo().dataDir, "cores").listFiles(); for (final File lib : libs) { String libName = lib.getName(); @@ -73,7 +72,7 @@ public final class CoreSelection extends ListActivity { } // Allow both libretro-core.so and libretro_core.so. - if (libName.startsWith("libretro") && !libName.startsWith("libretroarch")) { + if (libName.startsWith("libretro")) { adapter.add(new ModuleWrapper(this, lib, core_config)); } } diff --git a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java index 7c429d04dd..8d43f42006 100644 --- a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java +++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java @@ -42,7 +42,7 @@ public final class MainMenuActivity extends PreferenceActivity { // Get libretro path and name. SharedPreferences prefs = UserPreferences.getPreferences(this); - libretro_path = prefs.getString("libretro_path", getApplicationInfo().nativeLibraryDir); + libretro_path = prefs.getString("libretro_path", getApplicationInfo().dataDir + "/cores"); libretro_name = prefs.getString("libretro_name", getString(R.string.no_core)); // Bind audio stream to hardware controls.