From 30da38ff6b3d57c6c1a3840673cbcba52704ed0a Mon Sep 17 00:00:00 2001
From: Oscar Mira <valldrac@molly.im>
Date: Tue, 21 Apr 2020 19:43:55 +0200
Subject: [PATCH] Force NDK version for reproducible build

This reverts commit 9d28effd35fc854f76732ea6db993642c9bfef58.
---
 Dockerfile       | 2 ++
 app/build.gradle | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dbc023f259..360d133815 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ ENV ANDROID_API_LEVELS android-28
 ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3
 ENV ANDROID_SDK_DIST sdk-tools-linux-4333796.zip
 ENV ANDROID_SDK_SHA256 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
+ENV ANDROID_NDK_VERSION 21.0.6113669
 
 ENV ANDROID_HOME /opt/android-sdk-linux
 
@@ -21,6 +22,7 @@ RUN sdkmanager \
     "platform-tools" \
     "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
     "platforms;${ANDROID_API_LEVELS}" \
+    "ndk;${ANDROID_NDK_VERSION}" \
     "extras;google;m2repository" \
     "extras;android;m2repository"
 
diff --git a/app/build.gradle b/app/build.gradle
index 8e73c5330c..4e74fac533 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -147,7 +147,7 @@ android {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
         }
 
-        ndkVersion "21.1.6352462"
+        ndkVersion "21.0.6113669"
 
         resConfigs autoResConfig()