From bc83ca062aa2acf6a8de72e6f2db94572d03ec03 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Sun, 21 Nov 2021 05:21:22 +0700 Subject: [PATCH] Set min sdk to 24 --- .github/workflows/android.yml | 2 +- android-aarch64 | 4 ++-- android-arm32 | 4 ++-- android-x86_64 | 4 ++-- meson_options.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 007466ba6bfa..431658e9e141 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -35,7 +35,7 @@ jobs: --cross-file "android-${{matrix.arch}}" \ --buildtype debug \ -Dplatforms=android \ - -Dplatform-sdk-version=21 \ + -Dplatform-sdk-version=24 \ -Dandroid-stub=true \ -Dllvm=disabled \ -Dxlib-lease=disabled \ diff --git a/android-aarch64 b/android-aarch64 index 5ed34214287b..436c27e0dbea 100644 --- a/android-aarch64 +++ b/android-aarch64 @@ -1,7 +1,7 @@ [binaries] ar = '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar' -c = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] -cpp = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] +cpp = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] c_ld = 'lld' cpp_ld = 'lld' strip = '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip' diff --git a/android-arm32 b/android-arm32 index 2c4898495d1f..80f5ecd4324b 100644 --- a/android-arm32 +++ b/android-arm32 @@ -1,7 +1,7 @@ [binaries] ar = '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar' -c = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] -cpp = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] +cpp = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] c_ld = 'lld' cpp_ld = 'lld' strip = '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi29-strip' diff --git a/android-x86_64 b/android-x86_64 index d4dd5fd49bff..6627d647e147 100644 --- a/android-x86_64 +++ b/android-x86_64 @@ -1,7 +1,7 @@ [binaries] ar = '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar' -c = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] -cpp = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] +cpp = ['ccache', '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] c_ld = 'lld' cpp_ld = 'lld' strip = '/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-strip' diff --git a/meson_options.txt b/meson_options.txt index 7aecac4d7d44..5e29e1ddbecb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -481,7 +481,7 @@ option( option( 'platform-sdk-version', type : 'integer', - min : 21, + min : 24, max : 30, value : 25, description : 'Android Platform SDK version. Default: Nougat version.'