diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-06-07 22:44:13 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-06-07 22:44:13 -0500 |
| commit | 59e2225f7d81275a96e541c22a4df53bd361ff6d (patch) | |
| tree | f5ce0deb0587c1d4f7ac551c716504f3dc65be9a /Source/Android | |
| parent | 499478bcadfd34f986d2e7d4e2a1594d6cdd40a4 (diff) | |
Remove ARMv7 support.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/build.gradle | 10 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 56d8a88fbc..937bdcd538 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -52,16 +52,6 @@ android { // Define product flavors, which can be split into categories. Common examples // of product flavors are paid vs. free, ARM vs. x86, etc. productFlavors { - arm { - // This flavor is mutually exclusive against any flavor in the same dimension. - flavorDimension "abi" - - // When building this flavor, only include native libs from the specified folder. - ndk { - abiFilter "armeabi-v7a" - } - } - arm_64 { flavorDimension "abi" ndk { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java index a927d9824a..9dcc8776aa 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java @@ -42,11 +42,6 @@ public final class CPUSettingsFragment extends PreferenceFragment cpuCores.setEntries(R.array.emuCoreEntriesARM64); cpuCores.setEntryValues(R.array.emuCoreValuesARM64); } - else if (Build.CPU_ABI.contains("arm")) - { - cpuCores.setEntries(R.array.emuCoreEntriesARM); - cpuCores.setEntryValues(R.array.emuCoreValuesARM); - } else { cpuCores.setEntries(R.array.emuCoreEntriesOther); |
