summaryrefslogtreecommitdiff
path: root/docker/android-ndk
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-02-06 15:05:02 +0100
committercyBerta <cyberta@riseup.net>2018-02-06 15:05:02 +0100
commit1a37ac3f86e0bd44842a0fcd86de7c160acfbb04 (patch)
treebc32fb50b59c415097804fd7bbdb296641310cde /docker/android-ndk
parenta1ac4910f062ca8aca06e0468fffef751d3bb714 (diff)
parentedd34192484f4eb618fdcc2a68b18168c155d63c (diff)
Merge branch 'origin_0.9.8' into fupduck_8826_custom_provider
Diffstat (limited to 'docker/android-ndk')
-rw-r--r--docker/android-ndk/Dockerfile8
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 7739fa47..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 <info@leap.se>
-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
@@ -33,3 +33,7 @@ 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
+RUN sdkmanager --list \ No newline at end of file