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

signalapp · Aug 30, 2024 · 4152294 · 4152294
1 parent 1aaa833
commit 4152294
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -54,6 +54,7 @@ val signalBuildToolsVersion: String by rootProject.extra
 val signalCompileSdkVersion: String by rootProject.extra
 val signalTargetSdkVersion: Int by rootProject.extra
 val signalMinSdkVersion: Int by rootProject.extra
+val signalNdkVersion: String by rootProject.extra
 val signalJavaVersion: JavaVersion by rootProject.extra
 val signalKotlinJvmTarget: String by rootProject.extra
 
@@ -80,6 +81,7 @@ android {
 
   buildToolsVersion = signalBuildToolsVersion
   compileSdkVersion = signalCompileSdkVersion
+  ndkVersion = signalNdkVersion
 
   flavorDimensions += listOf("distribution", "environment")
   useLibrary("org.apache.http.legacy")

diff --git a/constants.gradle.kts b/constants.gradle.kts
@@ -2,5 +2,6 @@ val signalBuildToolsVersion by extra("34.0.0")
 val signalCompileSdkVersion by extra("android-34")
 val signalTargetSdkVersion by extra(34)
 val signalMinSdkVersion by extra(21)
+val signalNdkVersion by extra("27.0.12077973")
 val signalJavaVersion by extra(JavaVersion.VERSION_17)
 val signalKotlinJvmTarget by extra("17")
diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
@@ -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 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}"