From 6c354ccbe8640e3959d97610ebc33e08de863821 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 2 Feb 2018 00:37:35 +0100 Subject: #8832 accept google licenses also in ndk image --- docker/android-ndk/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docker/android-ndk/Dockerfile') diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 7739fa47..ffae4de4 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -33,3 +33,6 @@ RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ && rm -rf ndk.zip ENV PATH ${PATH}:${ANDROID_NDK_HOME} + +# Accept all licenses +RUN yes | sdkmanager --licenses \ No newline at end of file -- cgit v1.2.3 From 55abdcc6ec0773864ac16a74880c40c929e12c1d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 2 Feb 2018 01:18:03 +0100 Subject: #8832 add gradle task for license issue --- docker/android-ndk/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/android-ndk/Dockerfile') diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index ffae4de4..21b7dec0 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -35,4 +35,5 @@ RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ ENV PATH ${PATH}:${ANDROID_NDK_HOME} # Accept all licenses -RUN yes | sdkmanager --licenses \ No newline at end of file +RUN yes | sdkmanager --licenses +RUN sdkmanager --list \ No newline at end of file -- cgit v1.2.3 From 0926d0292abb2458ee700e4c5432d41752ed9f1e Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 6 Feb 2018 01:29:14 +0100 Subject: update ndk to version r16b --- docker/android-ndk/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/android-ndk/Dockerfile') diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 21b7dec0..49b08dcc 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -1,7 +1,7 @@ FROM 0xacab.org:4567/leap/bitmask_android/android-sdk:latest MAINTAINER LEAP Encryption Access Project -LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r15c" +LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r16b" # Make sure debconf doesn't complain about lack of interactivity ENV DEBIAN_FRONTEND noninteractive @@ -24,7 +24,7 @@ RUN apt-get update -qq && \ # ------------------------------------------------------ # --- Install Android NDK (for running C code) -ENV ANDROID_NDK_VERSION "r15c" +ENV ANDROID_NDK_VERSION "r16b" ENV ANDROID_NDK_HOME ${ANDROID_HOME}/android-ndk-${ANDROID_NDK_VERSION} ENV ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip -- cgit v1.2.3