From e07bdaa57a0d17684096d35c7303a56dc640c1d7 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Sun, 14 May 2017 23:46:14 -0400
Subject: [PATCH] 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: Hadrien De Sousa <hadrien.desousa@savoirfairelinux.com>
---
docker/Dockerfile | 41 ++++++++++++++++-------------------
ring-android/app/build.gradle | 2 +-
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fc0126f5d..fa18291f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 5e6579e5b..b1fc0a739 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -45,7 +45,7 @@ dependencies {
android {
compileSdkVersion 25
- buildToolsVersion "25.0.2"
+ buildToolsVersion "25.0.3"
defaultConfig {
minSdkVersion 16
--
GitLab