diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a921c790c..6cce2bbd9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,10 @@ jobs:
           config: { name: x86, flags: -DCMAKE_ANDROID_ARCH_ABI=x86 -DCMAKE_SYSTEM_NAME=Android -DSFML_BUILD_TEST_SUITE=FALSE -DCMAKE_ANDROID_NDK=$GITHUB_WORKSPACE/android-ndk-r18b -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26 }
         - platform: { name: Android, os: ubuntu-latest }
           config: { name: armeabi-v7a, flags: -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_SYSTEM_NAME=Android -DSFML_BUILD_TEST_SUITE=FALSE -DCMAKE_ANDROID_NDK=$GITHUB_WORKSPACE/android-ndk-r18b -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26 }
+        - platform: { name: Android, os: ubuntu-latest  }
+          config: { name: arm64-v8a, flags: -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a -DCMAKE_SYSTEM_NAME=Android -DSFML_BUILD_TEST_SUITE=FALSE -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/android-ndk-r18b/build/cmake/android.toolchain.cmake -DCMAKE_ANDROID_NDK=$GITHUB_WORKSPACE/android-ndk-r18b -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26 }
+        - platform: { name: Android, os: ubuntu-latest  }
+          config: { name: x86_64, flags: -DCMAKE_ANDROID_ARCH_ABI=x86_64 -DCMAKE_SYSTEM_NAME=Android -DSFML_BUILD_TEST_SUITE=FALSE -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/android-ndk-r18b/build/cmake/android.toolchain.cmake -DCMAKE_ANDROID_NDK=$GITHUB_WORKSPACE/android-ndk-r18b -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26 }
         - platform: { name: Linux GCC, os: ubuntu-latest  }
           config: { name: Static DRM, flags: -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_DRM=TRUE }
         - platform: { name: Linux GCC, os: ubuntu-latest  }
diff --git a/extlibs/libs-android/arm64-v8a/libFLAC.a b/extlibs/libs-android/arm64-v8a/libFLAC.a
new file mode 100644
index 000000000..b664a92a2
Binary files /dev/null and b/extlibs/libs-android/arm64-v8a/libFLAC.a differ
diff --git a/extlibs/libs-android/arm64-v8a/libfreetype.a b/extlibs/libs-android/arm64-v8a/libfreetype.a
new file mode 100644
index 000000000..3ba8bcf02
Binary files /dev/null and b/extlibs/libs-android/arm64-v8a/libfreetype.a differ
diff --git a/extlibs/libs-android/arm64-v8a/libogg.a b/extlibs/libs-android/arm64-v8a/libogg.a
new file mode 100644
index 000000000..20397a885
Binary files /dev/null and b/extlibs/libs-android/arm64-v8a/libogg.a differ
diff --git a/extlibs/libs-android/arm64-v8a/libopenal.so b/extlibs/libs-android/arm64-v8a/libopenal.so
new file mode 100644
index 000000000..e0ccfdfd7
Binary files /dev/null and b/extlibs/libs-android/arm64-v8a/libopenal.so differ
diff --git a/extlibs/libs-android/arm64-v8a/libvorbis.a b/extlibs/libs-android/arm64-v8a/libvorbis.a
new file mode 100644
index 000000000..628269ef8
Binary files /dev/null and b/extlibs/libs-android/arm64-v8a/libvorbis.a differ
diff --git a/extlibs/libs-android/arm64-v8a/libvorbisenc.a b/extlibs/libs-android/arm64-v8a/libvorbisenc.a
new file mode 100644
index 000000000..1d843cee5
Binary files /dev/null and b/extlibs/libs-android/arm64-v8a/libvorbisenc.a differ
diff --git a/extlibs/libs-android/arm64-v8a/libvorbisfile.a b/extlibs/libs-android/arm64-v8a/libvorbisfile.a
new file mode 100644
index 000000000..a22813efc
Binary files /dev/null and b/extlibs/libs-android/arm64-v8a/libvorbisfile.a differ
diff --git a/extlibs/libs-android/armeabi-v7a/libFLAC++.a b/extlibs/libs-android/armeabi-v7a/libFLAC++.a
deleted file mode 100644
index fdd44a2bf..000000000
Binary files a/extlibs/libs-android/armeabi-v7a/libFLAC++.a and /dev/null differ
diff --git a/extlibs/libs-android/armeabi/libFLAC++.a b/extlibs/libs-android/armeabi/libFLAC++.a
deleted file mode 100644
index 01dcf65c0..000000000
Binary files a/extlibs/libs-android/armeabi/libFLAC++.a and /dev/null differ
diff --git a/extlibs/libs-android/mips/libFLAC++.a b/extlibs/libs-android/mips/libFLAC++.a
deleted file mode 100644
index a00a9e3bd..000000000
Binary files a/extlibs/libs-android/mips/libFLAC++.a and /dev/null differ
diff --git a/extlibs/libs-android/x86/libFLAC++.a b/extlibs/libs-android/x86/libFLAC++.a
deleted file mode 100644
index 91f23cb42..000000000
Binary files a/extlibs/libs-android/x86/libFLAC++.a and /dev/null differ
diff --git a/extlibs/libs-android/x86_64/libFLAC.a b/extlibs/libs-android/x86_64/libFLAC.a
new file mode 100644
index 000000000..a0c562b6a
Binary files /dev/null and b/extlibs/libs-android/x86_64/libFLAC.a differ
diff --git a/extlibs/libs-android/x86_64/libfreetype.a b/extlibs/libs-android/x86_64/libfreetype.a
new file mode 100644
index 000000000..aefcc9371
Binary files /dev/null and b/extlibs/libs-android/x86_64/libfreetype.a differ
diff --git a/extlibs/libs-android/x86_64/libogg.a b/extlibs/libs-android/x86_64/libogg.a
new file mode 100644
index 000000000..38cda862a
Binary files /dev/null and b/extlibs/libs-android/x86_64/libogg.a differ
diff --git a/extlibs/libs-android/x86_64/libopenal.so b/extlibs/libs-android/x86_64/libopenal.so
new file mode 100644
index 000000000..6a62cbd5b
Binary files /dev/null and b/extlibs/libs-android/x86_64/libopenal.so differ
diff --git a/extlibs/libs-android/x86_64/libvorbis.a b/extlibs/libs-android/x86_64/libvorbis.a
new file mode 100644
index 000000000..3321fadf2
Binary files /dev/null and b/extlibs/libs-android/x86_64/libvorbis.a differ
diff --git a/extlibs/libs-android/x86_64/libvorbisenc.a b/extlibs/libs-android/x86_64/libvorbisenc.a
new file mode 100644
index 000000000..b3c5b94a1
Binary files /dev/null and b/extlibs/libs-android/x86_64/libvorbisenc.a differ
diff --git a/extlibs/libs-android/x86_64/libvorbisfile.a b/extlibs/libs-android/x86_64/libvorbisfile.a
new file mode 100644
index 000000000..d77145248
Binary files /dev/null and b/extlibs/libs-android/x86_64/libvorbisfile.a differ