empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update to NDK r27, and explicitly specify it in the app build.

Browse source
This commit is contained in:
Jordan Rose 2024-08-26 11:57:44 -07:00 • committed by Nicholas Tinsley
parent 1aaa833127
commit 4152294b57
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -54,6 +54,7 @@ val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by rootProject.extra val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by rootProject.extra val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by rootProject.extra val signalMinSdkVersion: Int by rootProject.extra
val signalNdkVersion: String by rootProject.extra
val signalJavaVersion: JavaVersion by rootProject.extra val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra val signalKotlinJvmTarget: String by rootProject.extra
@ -80,6 +81,7 @@ android {
buildToolsVersion = signalBuildToolsVersion buildToolsVersion = signalBuildToolsVersion
compileSdkVersion = signalCompileSdkVersion compileSdkVersion = signalCompileSdkVersion
ndkVersion = signalNdkVersion
flavorDimensions += listOf("distribution", "environment") flavorDimensions += listOf("distribution", "environment")
useLibrary("org.apache.http.legacy") useLibrary("org.apache.http.legacy")

1
constants.gradle.kts
View file

@ -2,5 +2,6 @@ val signalBuildToolsVersion by extra("34.0.0")
val signalCompileSdkVersion by extra("android-34") val signalCompileSdkVersion by extra("android-34")
val signalTargetSdkVersion by extra(34) val signalTargetSdkVersion by extra(34)
val signalMinSdkVersion by extra(21) val signalMinSdkVersion by extra(21)
val signalNdkVersion by extra("27.0.12077973")
val signalJavaVersion by extra(JavaVersion.VERSION_17) val signalJavaVersion by extra(JavaVersion.VERSION_17)
val signalKotlinJvmTarget by extra("17") val signalKotlinJvmTarget by extra("17")

2
reproducible-builds/Dockerfile
View file

@ -27,7 +27,7 @@ RUN unzip ${ANDROID_COMMAND_LINE_TOOLS_FILENAME} -d /usr/local/android-sdk-linux
RUN rm ${ANDROID_COMMAND_LINE_TOOLS_FILENAME} RUN rm ${ANDROID_COMMAND_LINE_TOOLS_FILENAME}
RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}" RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services" "ndk;25.1.8937393" "cmake;3.22.1" RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services" "ndk;27.0.12077973" "cmake;3.22.1"
RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}" RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"