diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
| commit | 3d827e7295d37ecb25332b39057338496f6f970d (patch) | |
| tree | f8c5272e125ed9abae72fb3598d25b1c09f06f89 /docker/android-ndk | |
| parent | 646e2ec7b868920f71c29243d2bbeb13deb811e3 (diff) | |
| parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) | |
Merge branch 'origin_0.9.8' into 8823_cw_tablet_layout
Diffstat (limited to 'docker/android-ndk')
| -rw-r--r-- | docker/android-ndk/Dockerfile | 8 |
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 |