diff options
| -rw-r--r-- | docker/android-emulator.dockerfile | 24 | ||||
| -rw-r--r-- | docker/android-ndk.dockerfile | 32 | ||||
| -rw-r--r-- | docker/android-sdk.dockerfile | 46 |
3 files changed, 59 insertions, 43 deletions
diff --git a/docker/android-emulator.dockerfile b/docker/android-emulator.dockerfile new file mode 100644 index 00000000..0201312b --- /dev/null +++ b/docker/android-emulator.dockerfile @@ -0,0 +1,24 @@ +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" + +# ------------------------------------------------------ +# --- System Dependencies + +# ensure GL compatibility + +RUN apt-get update -qq +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y mesa-utils +ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + +# ------------------------------------------------------ +# --- Install Android Emulator + +# Install Android SDK emulator package +RUN echo y | sdkmanager "emulator" + +# Install System Images for emulators +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-ndk.dockerfile b/docker/android-ndk.dockerfile new file mode 100644 index 00000000..0a3eabfd --- /dev/null +++ b/docker/android-ndk.dockerfile @@ -0,0 +1,32 @@ +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="r12b" + +# ------------------------------------------------------ +# --- Install System Dependencies + +RUN apt-get update -qq +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ + make gcc file lib32stdc++6 lib32z1 # JNI build dependencies w/ 32-bit compatible C libs + +# ------------------------------------------------------ +# --- Install Android NDK (for running C code) + +# NOTE(@aguestuser|4.23.17) +# We woud like to use te current version of Android NDK (r14b) but cannot +# due to pinned dependency on year-old version of `ics-openvpn` +# which has transitive dependency on `openssl` which will not compile with `clang` +# (starting in 13b, android ndk uses `clang` isntead of `gcc`) +# Upon rebasing onto to current HEAD of `ics-openvpn` and resolving conflicts, we +# should update to current version of `ndk`. + +ENV ANDROID_NDK_VERSION "r12b" +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 + +RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ + && unzip ndk.zip -d $ANDROID_HOME \ + && rm -rf ndk.zip + +ENV PATH ${PATH}:${ANDROID_NDK_HOME} diff --git a/docker/android-sdk.dockerfile b/docker/android-sdk.dockerfile index 753ac6a9..1007735d 100644 --- a/docker/android-sdk.dockerfile +++ b/docker/android-sdk.dockerfile @@ -1,22 +1,17 @@ FROM debian:stretch MAINTAINER LEAP Encryption Access Project <info@leap.se> -LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="0.0.1" +LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="25.2.5" # ------------------------------------------------------ # --- Install System Dependencies -# Update Debian RUN apt-get update -qq - -# Install Debian Packages RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ # the basics curl unzip git locales \ # java stuff - openjdk-8-jdk maven \ - # ndk dependencies - make gcc file lib32stdc++6 lib32z1 # (incl. 32-bit compatible versions) + openjdk-8-jdk maven # ------------------------------------------------------ # --- Set Locales @@ -45,30 +40,8 @@ RUN curl -L $ANDROID_SDK_URL -o sdk-tools.zip \ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools # ------------------------------------------------------ -# --- Install Android NDK (for running C code) - -# NOTE(@aguestuser|4.23.17) -# We woud like to use te current version of Android NDK (r14b) but cannot -# due to pinned dependency on year-old version of `ics-openvpn` -# which has transitive dependency on `openssl` which will not compile with `clang` -# (starting in 13b, android ndk uses `clang` isntead of `gcc`) -# Upon rebasing onto to current HEAD of `ics-openvpn` and resolving conflicts, we -# should update to current version of `ndk` (if possible). - -ENV ANDROID_NDK_VERSION "r12b" -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 - -RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ - && unzip ndk.zip -d $ANDROID_HOME \ - && rm -rf ndk.zip - -ENV PATH ${PATH}:${ANDROID_NDK_HOME} - -# ------------------------------------------------------ # --- Install Android SDK Tools Packages - # Install Platform Tools Package RUN echo y | sdkmanager "platform-tools" # echo y to accept google licenses @@ -87,19 +60,6 @@ RUN echo y | sdkmanager "build-tools;24.0.3" RUN echo y | sdkmanager "build-tools;23.0.3" # ------------------------------------------------------ -# --- Install Android Emulator - - -# RUN echo y | sdkmanager "emulator" - -# System Images for emulators -# RUN echo y | sdkmanager "system-images;android-25;google_apis;armeabi-v7a" -# RUN echo y | sdkmanager "system-images;android-24;google_apis;armeabi-v7a" -# RUN echo y | sdkmanager "system-images;android-23;google_apis;armeabi-v7a" -# RUN echo y | sdkmanager "system-images;android-23;google_apis;arm64-v8a" - -# ------------------------------------------------------ # --- Cleanup -RUN apt-get clean - +RUN apt clean |