From af8dba9c13a7024f4916aa997d3ccc285545b525 Mon Sep 17 00:00:00 2001 From: Fred Cox Date: Thu, 22 Aug 2019 10:55:02 +0300 Subject: [PATCH] Add cmake 3.6 to ndk image --- 28-ndk/Dockerfile | 2 +- 29-ndk/Dockerfile | 2 +- Dockerfile.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/28-ndk/Dockerfile b/28-ndk/Dockerfile index d5280c0..2bd228d 100644 --- a/28-ndk/Dockerfile +++ b/28-ndk/Dockerfile @@ -66,7 +66,7 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### -ENV ANDROID_NDK_PACKAGES "ndk-bundle" "cmake;3.10.2.4988404" "lldb;3.1" +ENV ANDROID_NDK_PACKAGES "ndk-bundle" "cmake;3.10.2.4988404" "cmake;3.6.4111459" "lldb;3.1" ENV ANDROID_NDK_ROOT $ANDROID_HOME/ndk-bundle ENV ANDROID_NDK_HOME $ANDROID_NDK_ROOT RUN sdkmanager --verbose $ANDROID_NDK_PACKAGES diff --git a/29-ndk/Dockerfile b/29-ndk/Dockerfile index 13f48e5..0f96e42 100644 --- a/29-ndk/Dockerfile +++ b/29-ndk/Dockerfile @@ -66,7 +66,7 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V #### -ENV ANDROID_NDK_PACKAGES "ndk-bundle" "cmake;3.10.2.4988404" "lldb;3.1" +ENV ANDROID_NDK_PACKAGES "ndk-bundle" "cmake;3.10.2.4988404" "cmake;3.6.4111459" "lldb;3.1" ENV ANDROID_NDK_ROOT $ANDROID_HOME/ndk-bundle ENV ANDROID_NDK_HOME $ANDROID_NDK_ROOT RUN sdkmanager --verbose $ANDROID_NDK_PACKAGES diff --git a/Dockerfile.template b/Dockerfile.template index be6e7e7..f70ea17 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -106,7 +106,7 @@ COPY tools-emulator/android-wait-for-emulator /opt/tools/ #### #### -ENV ANDROID_NDK_PACKAGES "ndk-bundle" "cmake;3.10.2.4988404" "lldb;3.1" +ENV ANDROID_NDK_PACKAGES "ndk-bundle" "cmake;3.10.2.4988404" "cmake;3.6.4111459" "lldb;3.1" ENV ANDROID_NDK_ROOT $ANDROID_HOME/ndk-bundle ENV ANDROID_NDK_HOME $ANDROID_NDK_ROOT RUN sdkmanager --verbose $ANDROID_NDK_PACKAGES