diff options
| author | cyberta <cyberta@riseup.net> | 2019-08-01 16:43:41 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2019-08-01 16:43:41 -0700 |
| commit | af49cc0388441a772daddc4a08fdab53165424e6 (patch) | |
| tree | a606822aeed0cd0070871b19692547e84916a895 | |
| parent | 2babd8100a4ffa55263fcb7f3b574f5eec001bf7 (diff) | |
| parent | 93a721c23b1a66e359566d69b9bbe1218d43ee98 (diff) | |
Merge branch 'update_ndk' into 'master'
update ndk version to r20 - preparation for go libraries cross compiling
See merge request leap/bitmask_android!92
| -rw-r--r-- | docker/android-ndk/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 60bad165..97e47005 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="r16b" +LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r20" # 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 "r16b" +ENV ANDROID_NDK_VERSION "r20" 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 |