Skip to content

Commit 91e1c2c

Browse files
committed
Add armeabi-v7a-hard when using NDK r11c.
1 parent 199f6bd commit 91e1c2c

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

android_build_files/android_abis.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,15 @@ android {
2727
}
2828
}
2929

30-
if (System.getenv('NDK_ROOT') && System.getenv('NDK_ROOT').contains('r16b')) {
31-
// Additional ABIs are added to the list when building using NDK r16b only.
30+
if (System.getenv('NDK_ROOT')) {
31+
if (System.getenv('NDK_ROOT').contains('r16b') || System.getenv('NDK_ROOT').contains('r11c')) {
32+
// Deprecated ABIs are added to the list when building using older NDKs only.
33+
// Rather than an exhaustive list, we only support r11c and r16b.
3234
android.defaultConfig.ndk.abiFilters.add("armeabi")
3335
android.defaultConfig.ndk.abiFilters.add("mips")
3436
android.defaultConfig.ndk.abiFilters.add("mips64")
37+
if (System.getenv('NDK_ROOT').contains('r11c')) {
38+
android.defaultConfig.ndk.abiFilters.add("armeabi-v7a-hard") // Removed after r11c.
39+
}
40+
}
3541
}

0 commit comments

Comments
 (0)