From 01705329c7c0abf3ff74044fa67bec596076389d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 15 Oct 2020 16:49:15 +0200
Subject: [PATCH] Added ndk version to build.gradle + updated docker file

---
 app/build.gradle               | 1 +
 docker-files/bc-dev-android-30 | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ae06a0022..11bdc115a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,6 +60,7 @@ android {
         versionName "${project.version}"
         applicationId getPackageName()
     }
+    ndkVersion "21.3.6528147"
 
     applicationVariants.all { variant ->
         variant.outputs.all {
diff --git a/docker-files/bc-dev-android-30 b/docker-files/bc-dev-android-30
index d3182af8a..ad77a587d 100644
--- a/docker-files/bc-dev-android-30
+++ b/docker-files/bc-dev-android-30
@@ -16,6 +16,7 @@ ENV SHELL=/bin/bash
 # Define environment
 ENV ANDROID_SDK 25.2.5
 ENV ANDROID_HOME /opt/android-sdk-linux
+ENV ANDROID_NDK_HOME /opt/android-sdk-linux/ndk
 
 # Install common general tools
 RUN apt-get update && \
@@ -26,10 +27,10 @@ RUN apt-get update && \
 RUN wget https://dl.google.com/android/repository/tools_r$ANDROID_SDK-linux.zip && \
     unzip tools_r$ANDROID_SDK-linux.zip -d $ANDROID_HOME && \
     rm -f tools_r$ANDROID_SDK-linux.zip
-ENV PATH $ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$PATH
+ENV PATH $ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:ANDROID_NDK_HOME:$PATH
 
 # Get the Android SDK
-RUN echo "y" | sdkmanager "platforms;android-30" "build-tools;30.0.2" "extras;android;m2repository" "extras;google;m2repository" "platform-tools" "tools"
+RUN echo "y" | sdkmanager "platforms;android-30" "build-tools;30.0.2" "extras;android;m2repository" "extras;google;m2repository" "platform-tools" "tools" "ndk;21.3.6528147"
 
 # Accept Android SDK licenses
 RUN yes | sdkmanager --licenses