Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added ndk version to build.gradle + updated docker file

Browse source
This commit is contained in:
Sylvain Berfini 2020-10-15 16:49:15 +02:00
parent d7f31b79cb
commit a1c61768d0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -62,6 +62,7 @@ android {
versionName "${project.version}" versionName "${project.version}"
applicationId getPackageName() applicationId getPackageName()
} }
ndkVersion "21.3.6528147"
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.all { variant.outputs.all {

5
docker-files/bc-dev-android-30
View file

@ -16,6 +16,7 @@ ENV SHELL=/bin/bash
# Define environment # Define environment
ENV ANDROID_SDK 25.2.5 ENV ANDROID_SDK 25.2.5
ENV ANDROID_HOME /opt/android-sdk-linux ENV ANDROID_HOME /opt/android-sdk-linux
ENV ANDROID_NDK_HOME /opt/android-sdk-linux/ndk
# Install common general tools # Install common general tools
RUN apt-get update && \ 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 && \ RUN wget https://dl.google.com/android/repository/tools_r$ANDROID_SDK-linux.zip && \
unzip tools_r$ANDROID_SDK-linux.zip -d $ANDROID_HOME && \ unzip tools_r$ANDROID_SDK-linux.zip -d $ANDROID_HOME && \
rm -f tools_r$ANDROID_SDK-linux.zip 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 # 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 # Accept Android SDK licenses
RUN yes | sdkmanager --licenses RUN yes | sdkmanager --licenses