Skip to content

Commit 199f6bd

Browse files
committed
Revert "Better way to check ndk version."
This reverts commit 30ed25f.
1 parent 30ed25f commit 199f6bd

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

android_build_files/android_abis.gradle

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

30-
if (android.ndkVersion.startsWith("16.") || android.ndkVersion.startsWith("11.")) {
31-
// Deprecated ABIs are added to the list when building using older NDKs only.
32-
// Rather than an exhaustive list of older NDK versions, we only support r16b and r11c.
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.
3332
android.defaultConfig.ndk.abiFilters.add("armeabi")
3433
android.defaultConfig.ndk.abiFilters.add("mips")
3534
android.defaultConfig.ndk.abiFilters.add("mips64")
36-
if (android.ndkVersion.startsWith("11.")) {
37-
android.defaultConfig.ndk.abiFilters.add("armeaby-v7a-hard") // Removed after NDK r11c.
38-
}
3935
}

0 commit comments

Comments
 (0)