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/assets/libretro_cores.cfg

@@ -1,86 +1,89 @@
-mednafen_pce_fast_libretro_android = "Mednafen PCE-fast"
+libretro_mednafen_pce_fast = "Mednafen PCE-fast"
-mednafen_pce_fast_libretro_android_system = "PC Engine/PC Engine CD"
+libretro_mednafen_pce_fast_system = "PC Engine/PC Engine CD"
 
-mednafen_wswan_libretro_android = "Mednafen WSwan"
+libretro_mednafen_wswan = "Mednafen WSwan"
-mednafen_wswan_libretro_android_system = "Wonderswan"
+libretro_mednafen_wswan_system = "Wonderswan"
 
-fceumm_libretro_android = "FCEUmm"
+libretro_fceumm = "FCEUmm"
-fceumm_libretro_android_system = "Nintendo NES"
+libretro_fceumm_system = "Nintendo NES"
 
-mednafen_vb_libretro_android = "Mednafen VB"
+libretro_mednafen_vb = "Mednafen VB"
-mednafen_vb_libretro_android_system = "Virtual Boy"
+libretro_mednafen_vb_system = "Virtual Boy"
 
-fba_libretro_android = "Final Burn Alpha"
+libretro_fba = "Final Burn Alpha"
-fba_libretro_anddroid_system = "Arcade"
+libretro_fba_system = "Arcade"
 
-mednafen_ngp_libretro_android = "Mednafen NGP"
+libretro_mednafen_ngp = "Mednafen NGP"
-mednafen_ngp_libretro_android_system = "Neo-Geo Pocket"
+libretro_mednafen_ngp_system = "Neo-Geo Pocket"
 
-mednafen_psx_libretro_android = "Mednafen PSX"
+libretro_mednafen_psx = "Mednafen PSX"
-mednafen_psx_libretro_android_system = "PlayStation1"
+libretro_mednafen_psx_system = "PlayStation1"
 
-gambatte_libretro_android = "Gambatte"
+libretro_gambatte = "Gambatte"
-gambatte_libretro_android_system = "GameBoy/GameBoy Color"
+libretro_gambatte_system = "GameBoy/GameBoy Color"
 
-handy_libretro_android = "Handy"
+libretro_handy = "Handy"
-handy_libretro_android_system = "Atari Lynx"
+libretro_handy_system = "Atari Lynx"
 
-genesis_plus_gx_libretro_android = "Genesis Plus GX"
+libretro_genesis_plus_gx = "Genesis Plus GX"
-genesis_plus_gx_libretro_android_system = "Sega Genesis/Sega CD/Master System"
+libretro_genesis_plus_gx_system = "Sega Genesis/Sega CD/Master System"
 
-picodrive_libretro_android = "Picodrive"
+libretro_picodrive = "Picodrive"
-picodrive_libretro_android_system = "Sega Genesis/Sega CD/Master System/32X"
+libretro_picodrive_system = "Sega Genesis/Sega CD/Master System/32X"
 
-vba_next_libretro_android = "VBA Next"
+libretro_vba_next = "VBA Next"
-vba_next_libretro_android_system = "GameBoy Advance"
+libretro_vba_next_system = "GameBoy Advance"
 
-vbam_libretro_android = "VBA-M"
+libretro_vbam = "VBA-M"
-vbam_libretro_android_system = "GameBoy Advance"
+libretro_vbam_system = "GameBoy Advance"
 
-prboom_libretro_android = "PrBoom"
+libretro_prboom = "PrBoom"
-prboom_libretro_android_system = "DOOM"
+libretro_prboom_system = "DOOM"
 
-snes9x_libretro_android = "SNES9x"
+libretro_snes9x = "SNES9x"
-snes9x_libretro_android_system = "Nintendo SNES"
+libretro_snes9x_system = "Nintendo SNES"
 
-snes9x_next_libretro_android = "SNES9x Next"
+libretro_snes9x_next = "SNES9x Next"
-snes9x_next_libretro_android_system = "Nintendo SNES"
+libretro_snes9x_next_system = "Nintendo SNES"
 
-nestopia_libretro_android = "Nestopia"
+libretro_nestopia = "Nestopia"
-nestopia_libretro_android_system = "Nintendo NES"
+libretro_nestopia_system = "Nintendo NES"
 
-pcsx_rearmed_libretro_android = "PCSX-reARMed"
+libretro_pcsx_rearmed-neon = "PCSX-reARMed [NEON]"
-pcsx_rearmed_libretro_android_system = "PlayStation1"
+libretro_pcsx_rearmed-neon_system = "PlayStation1"
 
-nxengine_libretro_android = "NXEngine"
+libretro_pcsx_rearmed = "PCSX-reARMed"
-nxengine_libretro_android_system = "Cave Story/Doukutsu Monogatari"
+libretro_pcsx_rearmed_system = "PlayStation1"
 
-quicknes_libretro_android = "QuickNES"
+libretro_nxengine = "NXEngine"
-quicknes_libretro_android_system = "Nintendo NES"
+libretro_nxengine_system = "Cave Story/Doukutsu Monogatari"
 
-tyrquake_libretro_android = "TyrQuake"
+libretro_quicknes = "QuickNES"
-tyrquake_libretro_android_system = "Quake 1"
+libretro_quicknes_system = "Nintendo NES"
 
-instancingviewer_libretro_android = "InstancingViewer"
+libretro_tyrquake = "TyrQuake"
-instancingviewer_libretro_android_system = "Images"
+libretro_tyrquake_system = "Quake 1"
 
-desmume_libretro_android = "Desmume"
+libretro_instancingviewer = "InstancingViewer"
-desmume_libretro_android_system = "Nintendo DS"
+libretro_instancingviewer_system = "Images"
 
-stella_libretro_android = "Stella"
+libretro_desmume = "Desmume"
-stella_lilbretro_android_system = "Atari 2600"
+libretro_desmume_system = "Nintendo DS"
 
-scenewalker_libretro_android = "SceneWalker"
+libretro_stella = "Stella"
-scenewalker_libretro_android_system = "Objects"
+libretro_stella_system = "Atari 2600"
 
-modelviewer_libretro_android = "ModelViewer"
+libretro_scenewalker = "SceneWalker"
-modelviewer_libretro_android_system = "Objects"
+libretro_scenewalker_system = "Objects"
 
-mame078_libretro_android = "MAME 2003 [0.78]"
+libretro_modelviewer = "ModelViewer"
-mame078_libretro_android_system = "Arcade"
+libretro_modelviewer_system = "Objects"
 
-bsnes_performance_libretro_android = "bsnes/higan Performance"
+libretro_mame078 = "MAME 2003 [0.78]"
-bsnes_performance_libretro_android_system = "Nintendo SNES"
+libretro_mame078_system = "Arcade"
 
-dinothawr_libretro_android = "Dinothawr"
+libretro_bsnes_performance = "bsnes/higan Performance"
-dinothawr_libretro_android_system = "Puzzle Game"
+libretro_bsnes_performance_system = "Nintendo SNES"
+
+libretro_dinothawr = "Dinothawr"
+libretro_dinothawr_system = "Puzzle Game"

android/phoenix/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-17

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

@@ -48,10 +48,35 @@ 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;
+
+			// If we have a NEON version with NEON capable CPU,
+			// never append a non-NEON version.
+			if (cpuIsNeon && !libName.contains("neon")) {
+				boolean hasNeonVersion = false;
+				for (final File lib_ : libs) {
+					String otherName = lib_.getName();
+					String baseName = libName.replace(".so", "");
+					if (otherName.contains("neon")
+							&& otherName.startsWith(baseName)) {
+						hasNeonVersion = true;
+						break;
+					}
+				}
+
+				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("libretroarch")) {
+			if (libName.startsWith("libretro")
+					&& !libName.startsWith("libretroarch")) {
 				try {
 					adapter.add(new ModuleWrapper(this, lib, core_config));
 				} catch (IOException e) {

android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java

@@ -373,7 +373,6 @@ public final class UserPreferences
 				path.lastIndexOf("."));
 		sanitized_name = sanitized_name.replace("neon", "");
 		sanitized_name = sanitized_name.replace("libretro_", "");
-		sanitized_name = sanitized_name.replace("_android", "");
 
 		return sanitized_name;
 	}