diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index 84b6c24f58..685fbdc027 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -137,6 +137,7 @@
JIT64 Recompiler
JITIL Recompiler
JIT ARM Recompiler
+ JIT ARM64 Recompiler
CPU
CPUコア
%s
diff --git a/Source/Android/res/values/arrays.xml b/Source/Android/res/values/arrays.xml
index 4233c194be..1822ede7c1 100644
--- a/Source/Android/res/values/arrays.xml
+++ b/Source/Android/res/values/arrays.xml
@@ -3,13 +3,13 @@
-
-
+
+
- @string/interpreter
- @string/jit64_recompiler
- @string/jitil_recompiler
-
+
- 0
- 1
- 2
@@ -24,6 +24,16 @@
- 0
- 3
+
+
+
+ - @string/interpreter
+ - @string/jit_arm64_recompiler
+
+
+ - 0
+ - 4
+
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 92e3094121..eee83eb431 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -138,6 +138,7 @@
JIT64 Recompiler
JITIL Recompiler
JIT ARM Recompiler
+ JIT ARM64 Recompiler
CPU
CPU Core
%s
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"))
{