Merge branch '#8832_update_ics-openvpn' into '0.9.8'

#8832 update ics openvpn

See merge request leap/bitmask_android!33

3 files changed, 15 insertions, 10 deletions

diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile
index bececd08..97150799 100644
--- a/docker/android-emulator/Dockerfile
+++ b/docker/android-emulator/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 SDK baseimage based on debian:stretch" Vendor="LEAP" Version="25"
+LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="26"
 
 # Make sure debconf doesn't complain about lack of interactivity
 ENV DEBIAN_FRONTEND noninteractive
@@ -31,7 +31,8 @@ RUN apt-get update -qq && \
 RUN echo y | sdkmanager "emulator"
 
 # Install System Images for emulators
-RUN echo y | sdkmanager "system-images;android-26;google_apis;x86"
+RUN echo y | sdkmanager "system-images;android-27;google_apis;x86"
 RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64"
-RUN echo y | sdkmanager "system-images;android-24;google_apis;x86_64"
 RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64"
+
+RUN echo no | avdmanager create avd --force --name testApi27 --abi google_apis/x86 --package 'system-images;android-27;google_apis;x86'
\ No newline at end of file
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
diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile
index fbb63aa8..f57280c6 100644
--- a/docker/android-sdk/Dockerfile
+++ b/docker/android-sdk/Dockerfile
@@ -59,14 +59,14 @@ RUN echo y | sdkmanager "platform-tools" # echo y to accept google licenses
 RUN sdkmanager "extras;android;m2repository"
 
 # Install Build Tools (Please keep in descending order)
-RUN sdkmanager "build-tools;26.0.0"
+RUN sdkmanager "build-tools;27.0.3"
 RUN sdkmanager "build-tools;25.0.2"
-RUN sdkmanager "build-tools;25.0.0"
-RUN sdkmanager "build-tools;24.0.3"
 RUN sdkmanager "build-tools;23.0.3"
 
 # Install Target SDK Packages (Please keep in descending order)
-RUN sdkmanager "platforms;android-26"
+RUN sdkmanager "platforms;android-27"
 RUN sdkmanager "platforms;android-25"
-RUN sdkmanager "platforms;android-24"
 RUN sdkmanager "platforms;android-23"
+
+# Accept all licenses
+RUN yes | sdkmanager --licenses
\ No newline at end of file