From 200052a67c523be5c604691fe98ef80ce1125436 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 4 Jul 2023 22:07:46 +0300 Subject: [PATCH] fixes --- linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile | 5 ++--- linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile | 5 ++--- linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile | 5 ++--- linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile index d02ae7165..a02223add 100644 --- a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile +++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile @@ -394,7 +394,7 @@ RUN sdkmanager --install \ "ndk-bundle;r25b" \ "ndk-bundle;r25c" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;11.0.2655954" \ "ndk;11.1.2683735" \ "ndk;11.2.2725575" \ @@ -453,7 +453,7 @@ RUN sdkmanager--install \ "ndk;25.1.8937393" \ "ndk;25.2.9519653" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;r10e" \ "ndk;r11" \ "ndk;r11b" \ @@ -513,7 +513,6 @@ RUN sdkmanager--install \ "ndk;r25b" \ "ndk;r25c" - RUN sdkmanager --install \ "tools" \ "tools;20.0.1" \ diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile index 8c9659a57..f10237cfb 100644 --- a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile +++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile @@ -394,7 +394,7 @@ RUN sdkmanager --install \ "ndk-bundle;r25b" \ "ndk-bundle;r25c" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;11.0.2655954" \ "ndk;11.1.2683735" \ "ndk;11.2.2725575" \ @@ -453,7 +453,7 @@ RUN sdkmanager--install \ "ndk;25.1.8937393" \ "ndk;25.2.9519653" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;r10e" \ "ndk;r11" \ "ndk;r11b" \ @@ -513,7 +513,6 @@ RUN sdkmanager--install \ "ndk;r25b" \ "ndk;r25c" - RUN sdkmanager --install \ "tools" \ "tools;20.0.1" \ diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile index 33d74477f..48b6de202 100644 --- a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile +++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile @@ -381,7 +381,7 @@ RUN sdkmanager --install \ "ndk-bundle;r25b" \ "ndk-bundle;r25c" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;11.0.2655954" \ "ndk;11.1.2683735" \ "ndk;11.2.2725575" \ @@ -440,7 +440,7 @@ RUN sdkmanager--install \ "ndk;25.1.8937393" \ "ndk;25.2.9519653" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;r10e" \ "ndk;r11" \ "ndk;r11b" \ @@ -500,7 +500,6 @@ RUN sdkmanager--install \ "ndk;r25b" \ "ndk;r25c" - RUN sdkmanager --install \ "tools" \ "tools;20.0.1" \ diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile index 3800e8f59..cd86054ca 100644 --- a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile +++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile @@ -381,7 +381,7 @@ RUN sdkmanager --install \ "ndk-bundle;r25b" \ "ndk-bundle;r25c" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;11.0.2655954" \ "ndk;11.1.2683735" \ "ndk;11.2.2725575" \ @@ -440,7 +440,7 @@ RUN sdkmanager--install \ "ndk;25.1.8937393" \ "ndk;25.2.9519653" -RUN sdkmanager--install \ +RUN sdkmanager --install \ "ndk;r10e" \ "ndk;r11" \ "ndk;r11b" \ @@ -500,7 +500,6 @@ RUN sdkmanager--install \ "ndk;r25b" \ "ndk;r25c" - RUN sdkmanager --install \ "tools" \ "tools;20.0.1" \