From d679bb217d1737f3665ac034625fd5bfa566edd7 Mon Sep 17 00:00:00 2001
From: Amab <juanmi1982@gmail.com>
Date: Thu, 2 May 2024 10:53:35 +0200
Subject: [PATCH] Add emulator package

---
 Dockerfile                  | 10 ++++++----
 tools/android-env.sh        |  2 +-
 tools/android-sdk-update.sh |  2 +-
 tools/entrypoint.sh         |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e2c582a..38634f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ FROM eclipse-temurin:19-jdk
 ENV DEBIAN_FRONTEND noninteractive
 
 ARG SDK_VERSION=34.0.0
+ARG PLATFORM_VERSION="android-34"
 ENV ANDROID_HOME      /opt/android-sdk-linux
 ENV ANDROID_SDK_HOME  ${ANDROID_HOME}
 ENV ANDROID_SDK_ROOT  ${ANDROID_HOME}
@@ -27,12 +28,13 @@ COPY licenses /opt/licenses
 
 WORKDIR /opt/android-sdk-linux
 
-RUN /opt/tools/entrypoint.sh built-in
+RUN /opt/tools/entrypoint.sh built-in "${SDK_VERSION}"
 
 RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest"
 RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;${SDK_VERSION}"
 RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools"
-RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-34"
-RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-34;google_apis;x86_64"
+RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;${PLATFORM_VERSION}"
+RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;${PLATFORM_VERSION};google_apis;x86_64"
+RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "emulator"
 
-CMD /opt/tools/entrypoint.sh built-in
+CMD /opt/tools/entrypoint.sh built-in "${SDK_VERSION}"
diff --git a/tools/android-env.sh b/tools/android-env.sh
index 342fd41..0c5e189 100644
--- a/tools/android-env.sh
+++ b/tools/android-env.sh
@@ -8,7 +8,7 @@ export ANDROID_SDK=${ANDROID_HOME}
 export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin
 export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin
 export PATH=${PATH}:${ANDROID_HOME}/tools/bin
-export PATH=${PATH}:${ANDROID_HOME}/build-tools/34.0.0
+export PATH=${PATH}:${ANDROID_HOME}/build-tools/${2}
 export PATH=${PATH}:${ANDROID_HOME}/platform-tools
 export PATH=${PATH}:${ANDROID_HOME}/emulator
 export PATH=${PATH}:${ANDROID_HOME}/bin
diff --git a/tools/android-sdk-update.sh b/tools/android-sdk-update.sh
index 11f6f99..a57c367 100755
--- a/tools/android-sdk-update.sh
+++ b/tools/android-sdk-update.sh
@@ -2,7 +2,7 @@
 
 mkdir -p /opt/android-sdk-linux/bin/
 cp /opt/tools/android-env.sh /opt/android-sdk-linux/bin/
-source /opt/android-sdk-linux/bin/android-env.sh
+source /opt/android-sdk-linux/bin/android-env.sh "${2}"
 
 built_in_sdk=1
 
diff --git a/tools/entrypoint.sh b/tools/entrypoint.sh
index 74a629b..5fad2f4 100755
--- a/tools/entrypoint.sh
+++ b/tools/entrypoint.sh
@@ -13,7 +13,7 @@ chown android:android /opt/android-sdk-linux
 if checkbin; then
     exec su-exec android:android /opt/tools/android-sdk-update.sh "$@"
 else
-    su_mt_user /opt/tools/android-sdk-update.sh ${1}
+    su_mt_user /opt/tools/android-sdk-update.sh "${1}"
 fi