summaryrefslogtreecommitdiff
path: root/Source/Android/src
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-08-28 17:18:09 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2014-08-28 18:00:32 -0500
commit5bf94722140d09905d655f76240a17499195dff5 (patch)
treed7215336050010fca6ed23b103135296fd32c846 /Source/Android/src
parent683191b6c6bfca8945dfb2dc5669b3d092b33643 (diff)
Update shown CPU cores in the Android UI.
Only show the JIT cores on x86_64(Will have its own issues once we reach that point) Show AArch64 JIT if running on a AArch64 device(Good luck with that for now. Future proofing though)
Diffstat (limited to 'Source/Android/src')
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
index 77caec2b83..134e1cdb65 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
@@ -32,10 +32,15 @@ public final class CPUSettingsFragment extends PreferenceFragment
// Set valid emulation cores depending on the CPU architecture
// that the Android device is running on.
//
- if (Build.CPU_ABI.contains("x86"))
+ if (Build.CPU_ABI.contains("x86-64"))
{
- cpuCores.setEntries(R.array.emuCoreEntriesX86);
- cpuCores.setEntryValues(R.array.emuCoreValuesX86);
+ cpuCores.setEntries(R.array.emuCoreEntriesX86_64);
+ cpuCores.setEntryValues(R.array.emuCoreValuesX86_64);
+ }
+ else if (Build.CPU_ABI.contains("arm64"))
+ {
+ cpuCores.setEntries(R.array.emuCoreEntriesARM64);
+ cpuCores.setEntryValues(R.array.emuCoreValuesARM64);
}
else if (Build.CPU_ABI.contains("arm"))
{