Skip to content
Snippets Groups Projects
Commit e07bdaa5 authored by Adrien Béraud's avatar Adrien Béraud Committed by Hadrien De Sousa
Browse files

docker: update Android SDK tools


* use new Android SDK tools
* download NDK using sdkmanager
* don't install platform-tools (adb, fastboot...),
  unused to build APKs
* install gaz-preprocessor, used by ffmpeg
  to build ASM code for armv7

Change-Id: I1e2973c18d07dfd3dfee9a49632fe495441e3703
Reviewed-by: default avatarHadrien De Sousa <hadrien.desousa@savoirfairelinux.com>
parent eecebea1
Branches
Tags
No related merge requests found
......@@ -36,34 +36,31 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
zip \
&& locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL
ENV ANDROID_DEPS=\
'platform-tools \
build-tools;25.0.2 \
platforms;android-25 \
extras;android;m2repository \
extras;google;m2repository'
# Android Linux SDK tools
# See http://developer.android.com/sdk/index.html
RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/tools_r25.2.3-linux.zip && \
# Android SDK tools
RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip && \
mkdir -p /opt/android-sdk && \
unzip -d /opt/android-sdk /tmp/android-tools.zip && \
rm -f /tmp/android-tools.zip && \
chown -R root:root /opt/android-sdk
# Android Linux NDK
# See http://developer.android.com/tools/sdk/ndk/index.html
RUN wget -O /tmp/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip && \
unzip /tmp/android-ndk.zip -d /opt/ && \
rm -f /tmp/android-ndk.zip && \
chown -R root:root /opt/android-ndk-r14
# Other tools and resources of Android SDK
ENV ANDROID_HOME=/opt/android-sdk
ENV ANDROID_SDK=/opt/android-sdk
ENV ANDROID_NDK=/opt/android-ndk-r14
ENV PATH=${PATH}:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
ENV PATH=${PATH}:${ANDROID_HOME}/tools/bin
RUN (while sleep 1; do echo "y"; done) | sdkmanager --update
# Android SDK libraries, NDK
ENV ANDROID_DEPS=\
'build-tools;25.0.3 \
platforms;android-25 \
extras;android;m2repository \
extras;google;m2repository \
ndk-bundle'
RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS
ENV ANDROID_SDK=/opt/android-sdk
ENV ANDROID_NDK=/opt/android-sdk/ndk-bundle
# Gas-preprocessor (for ffmpeg ASM)
RUN wget https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/master/gas-preprocessor.pl && \
chmod a+x gas-preprocessor.pl && \
mv gas-preprocessor.pl /usr/bin
WORKDIR /home/builder/src
VOLUME /home/builder/src
......@@ -45,7 +45,7 @@ dependencies {
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"
defaultConfig {
minSdkVersion 16
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment