diff --git a/app/build.gradle b/app/build.gradle index df64d20d7..cfb0bffb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,6 +62,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