Add emulator package

This commit is contained in:
Amab 2024-05-02 10:53:35 +02:00
parent 644a59335b
commit d679bb217d
4 changed files with 9 additions and 7 deletions

View File

@ -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}"

View File

@ -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

View File

@ -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

View File

@ -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