Add cmake 3.6 to ndk image

slavasemeniuk · Aug 22, 2019 · af8dba9 · af8dba9
1 parent 5caebd6
commit af8dba9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/28-ndk/Dockerfile b/28-ndk/Dockerfile
@@ -66,7 +66,7 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V
 
 
 ##<ndk>##
-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
@@ -66,7 +66,7 @@ RUN sdkmanager --verbose "platform-tools" "platforms;android-$ANDROID_PLATFORM_V
 
 
 ##<ndk>##
-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
@@ -106,7 +106,7 @@ COPY tools-emulator/android-wait-for-emulator /opt/tools/
 ##</emulator>##
 
 ##<ndk>##
-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