From c27520116bee51af38255c1421d6eb92b0735f19 Mon Sep 17 00:00:00 2001
From: STAM <stam@epicm.org>
Date: Tue, 4 Jul 2023 22:42:15 +0300
Subject: [PATCH] moar android improvements

---
 linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile  | 3 ++-
 linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile  | 3 ++-
 linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile | 3 ++-
 linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile
index a02223add..7072913eb 100644
--- a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile
@@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
 ENV KTC_PATH=${KTC_ROOT}/kotlinc
 ENV KTC_BIN=$KTC_PATH/bin
 
-ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
+ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
 
 ##################################################################
 #                   installing java11
@@ -566,6 +566,7 @@ RUN sdkmanager --install \
 #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
 RUN rm -rfv /usr/lib/android-sdk/licenses/*
 RUN yes | sdkmanager --licenses
+RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
 
 ##################################################################
 #                   GRADLE
diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile
index f10237cfb..c0350f718 100644
--- a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile
@@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
 ENV KTC_PATH=${KTC_ROOT}/kotlinc
 ENV KTC_BIN=$KTC_PATH/bin
 
-ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
+ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
 
 ##################################################################
 #                   installing java17
@@ -566,6 +566,7 @@ RUN sdkmanager --install \
 #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
 RUN rm -rfv /usr/lib/android-sdk/licenses/*
 RUN yes | sdkmanager --licenses
+RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
 
 ##################################################################
 #                   GRADLE
diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
index 48b6de202..56e893f02 100644
--- a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
@@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
 ENV KTC_PATH=${KTC_ROOT}/kotlinc
 ENV KTC_BIN=$KTC_PATH/bin
 
-ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
+ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
 
 ##################################################################
 #                   Android SDK
@@ -553,6 +553,7 @@ RUN sdkmanager --install \
 #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
 RUN rm -rfv /usr/lib/android-sdk/licenses/*
 RUN yes | sdkmanager --licenses
+RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
 
 ##################################################################
 #                   GRADLE
diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
index cd86054ca..fbaf5fa39 100644
--- a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
@@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
 ENV KTC_PATH=${KTC_ROOT}/kotlinc
 ENV KTC_BIN=$KTC_PATH/bin
 
-ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
+ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
 
 ##################################################################
 #                   Android SDK
@@ -553,6 +553,7 @@ RUN sdkmanager --install \
 #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
 RUN rm -rfv /usr/lib/android-sdk/licenses/*
 RUN yes | sdkmanager --licenses
+RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
 
 ##################################################################
 #                   GRADLE