From a22a22d8fffb312b0d6dfdf545ff6fe6f05dbcee Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 29 Jan 2018 16:10:15 +0100 Subject: #8818 test NavigationDrawer with espresso test and update sdk therefore --- docker/android-emulator/Dockerfile | 3 +-- docker/android-sdk/Dockerfile | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index bececd08..cc9e0750 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -31,7 +31,6 @@ 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" diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index fbb63aa8..3218d369 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -59,14 +59,11 @@ 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" -- cgit v1.2.3 From a82e9f9290114e1d41ddf36797e1cdb764a6a758 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 29 Jan 2018 19:35:48 +0100 Subject: #8818 continuous integration for ui tests --- docker/android-emulator/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index cc9e0750..161b5ae4 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -34,3 +34,5 @@ RUN echo y | sdkmanager "emulator" 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-23;google_apis;x86_64" + +RUN avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file -- cgit v1.2.3 From 033e2d25f1ce1ff4ec64fb5e80d7feb918f868dd Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 29 Jan 2018 21:00:52 +0100 Subject: #8818 fix emulator setup command --- docker/android-emulator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 161b5ae4..3ea9e311 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -35,4 +35,4 @@ 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-23;google_apis;x86_64" -RUN avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file +RUN echo no | avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file -- cgit v1.2.3 From a43778e930041ab26e4d70348553fb98c3f6872d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 30 Jan 2018 13:00:32 +0100 Subject: #8818 add abi option to emulator setup --- docker/android-emulator/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 3ea9e311..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 -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 @@ -35,4 +35,4 @@ 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-23;google_apis;x86_64" -RUN echo no | avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file +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 -- cgit v1.2.3 From 743d95fd945b95269f9204b3ecb80f91927c15c7 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 1 Feb 2018 18:46:54 +0100 Subject: #8832 dear ci: say yes to googles licences --- docker/android-sdk/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docker') diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 3218d369..f57280c6 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -67,3 +67,6 @@ RUN sdkmanager "build-tools;23.0.3" RUN sdkmanager "platforms;android-27" RUN sdkmanager "platforms;android-25" RUN sdkmanager "platforms;android-23" + +# Accept all licenses +RUN yes | sdkmanager --licenses \ No newline at end of file -- cgit v1.2.3 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') 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') 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') 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