diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-08-28 18:20:35 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-08-28 18:20:35 -0500 |
| commit | fc92490031ef73c798468573d1b91c89ab309c6c (patch) | |
| tree | 37c589798063cc58099c1784cc02eb325d70ff76 /Source/Android/src | |
| parent | d140964d9b5480087f7891e73d4e829599f94cde (diff) | |
| parent | 5bf94722140d09905d655f76240a17499195dff5 (diff) | |
Merge pull request #902 from Sonicadvance1/android-64bit-support
Update shown CPU cores in the Android UI.
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java | 11 |
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")) { |