mirror/libsignal
0
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 03:52:17 +02:00
Code

Remove Android 19 support

Browse Source
This commit is contained in:
Jordan Rose 2023-01-26 11:20:54 -08:00
parent 9c02d7a8cd
commit 5b3d8bb731
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/slow_tests.yml vendored
View File

@ -49,11 +49,6 @@ jobs:
fail-fast: false
matrix:
arch: [x86, x86_64]
include:
- arch: x86
api-level: 19
- arch: x86_64
api-level: 21
steps:
- run: 'echo "JAVA_HOME=$JAVA_HOME_11_X64" >> "$GITHUB_ENV"'
@ -75,14 +70,14 @@ jobs:
path: |
~/.android/avd/*
~/.android/adb*
key: avd-${{ matrix.arch }}-${{ matrix.api-level }}
key: avd-${{ matrix.arch }}-21
- name: Create AVD and generate snapshot for caching
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0 # v2.27.0
with:
arch: ${{ matrix.arch }}
api-level: ${{ matrix.api-level }}
api-level: 21
force-avd-creation: false
emulator-options: -no-window -noaudio -no-boot-anim
script: echo "Generated AVD snapshot for caching."
@ -91,7 +86,7 @@ jobs:
uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0 # v2.27.0
with:
arch: ${{ matrix.arch }}
api-level: ${{ matrix.api-level }}
api-level: 21
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -noaudio -no-boot-anim
script: ./gradlew android:connectedCheck -x makeJniLibrariesDesktop -x android:makeJniLibraries

2
java/android/benchmarks/build.gradle
View File

@ -13,7 +13,7 @@ android {
compileSdkVersion 31
defaultConfig {
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 30
multiDexEnabled true
}

2
java/android/build.gradle
View File

@ -20,7 +20,7 @@ android {
ndkVersion '25.1.8937393'
defaultConfig {
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 30
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

4
java/build_jni.sh
View File

@ -37,9 +37,9 @@ then
# Use the Android NDK's prebuilt Clang+lld as Rust's linker.
ANDROID_TOOLCHAIN_DIR=$(echo "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt"/*/bin/)
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_TOOLCHAIN_DIR}/aarch64-linux-android21-clang"
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_TOOLCHAIN_DIR}/armv7a-linux-androideabi19-clang"
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_TOOLCHAIN_DIR}/armv7a-linux-androideabi21-clang"
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="${ANDROID_TOOLCHAIN_DIR}/x86_64-linux-android21-clang"
export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="${ANDROID_TOOLCHAIN_DIR}/i686-linux-android19-clang"
export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="${ANDROID_TOOLCHAIN_DIR}/i686-linux-android21-clang"
export RUSTFLAGS="-C link-arg=-fuse-ld=lld ${RUSTFLAGS:-}"
echo_then_run cargo build -p libsignal-jni --release -Z unstable-options --target aarch64-linux-android --out-dir "${ANDROID_LIB_DIR}/arm64-v8a"

2
rust/attest/Cargo.toml
View File

@ -12,7 +12,7 @@ license = "AGPL-3.0-only"
[dependencies]
boring = { git = "https://github.com/signalapp/boring", branch = "libsignal", default-features = false }
boring-sys = { git = "https://github.com/signalapp/boring", branch = "libsignal", default-features = false, features = ["android-api-19"] }
boring-sys = { git = "https://github.com/signalapp/boring", branch = "libsignal", default-features = false }
asn1 = "0.9.1"
bitflags = "1.3.2"