From 0dbc753d988763637bd7b218ff04de1a6d92609f Mon Sep 17 00:00:00 2001 From: ppoffice Date: Wed, 9 Feb 2022 09:09:55 -0500 Subject: [PATCH] update to android sdk 31 --- Dockerfile | 8 ++++---- README.md | 30 +++++++++++++++--------------- tools/android-env.sh | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4bbbf7..76afddf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV ANDROID_SDK ${ANDROID_HOME} ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin" ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin" ENV PATH "${PATH}:${ANDROID_HOME}/tools/bin" -ENV PATH "${PATH}:${ANDROID_HOME}/build-tools/30.0.2" +ENV PATH "${PATH}:${ANDROID_HOME}/build-tools/32.0.0" ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools" ENV PATH "${PATH}:${ANDROID_HOME}/emulator" ENV PATH "${PATH}:${ANDROID_HOME}/bin" @@ -30,9 +30,9 @@ WORKDIR /opt/android-sdk-linux RUN /opt/tools/entrypoint.sh built-in 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;30.0.2" +RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;32.0.0" RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-30;google_apis;x86_64" +RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-31" +RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-31;google_apis;x86_64" CMD /opt/tools/entrypoint.sh built-in diff --git a/README.md b/README.md index 20c5e2d..17c3430 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,32 @@ -# Docker for Android SDK 30 +# Docker for Android SDK 31 -Docker for Android SDK 30 with preinstalled build tools and emulator image +Docker for Android SDK 31 with preinstalled build tools and emulator image > Edit from [mindrunner/docker-android-sdk](https://github.com/mindrunner/docker-android-sdk) **Installed Packages** ```bash # sdkmanager --list - Path | Version | Description | Location - ------- | ------- | ------- | ------- - build-tools;30.0.2 | 30.0.2 | Android SDK Build-Tools 30.0.2 | build-tools/30.0.2/ - cmdline-tools;latest | 2.1 | Android SDK Command-line Tools (latest) | cmdline-tools/latest/ - emulator | 30.1.5 | Android Emulator | emulator/ - patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4/ - platform-tools | 30.0.4 | Android SDK Platform-Tools | platform-tools/ - platforms;android-30 | 3 | Android SDK Platform 30 | platforms/android-30/ - system-images;android-30;google_apis;x86_64 | 8 | Google APIs Intel x86 Atom_64 System Image | system-images/android-30/google_apis/x86_64/ + Path | Version | Description | Location + ------- | ------- | ------- | ------- + build-tools;32.0.0 | 32.0.0 | Android SDK Build-Tools 32 | build-tools/32.0.0 + cmdline-tools;latest | 6.0 | Android SDK Command-line Tools (latest) | cmdline-tools/latest + emulator | 31.2.8 | Android Emulator | emulator + patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4 + platform-tools | 32.0.0 | Android SDK Platform-Tools | platform-tools + platforms;android-31 | 1 | Android SDK Platform 31 | platforms/android-31 + system-images;android-31;google_apis;x86_64 | 8 | Google APIs Intel x86 Atom_64 System Image | system-images/android-31/google_apis/x86_64 ``` **Usage** - Interactive way ```bash - $ docker run -it --rm --device /dev/kvm androidsdk/android-30:latest bash + $ docker run -it --rm --device /dev/kvm androidsdk/android-31:latest bash # check installed packages $ sdkmanager --list # create and run emulator - $ avdmanager create avd -n first_avd --abi google_apis/x86_64 -k "system-images;android-30;google_apis;x86_64" + $ avdmanager create avd -n first_avd --abi google_apis/x86_64 -k "system-images;android-31;google_apis;x86_64" $ emulator -avd first_avd -no-window -no-audio & $ adb devices # You can also run other Android platform tools, which are all added to the PATH environment variable @@ -38,8 +38,8 @@ Docker for Android SDK 30 with preinstalled build tools and emulator image - Non-interactive way ```bash # check installed packages - $ docker run -it --rm androidsdk/android-30:latest sdkmanager --list + $ docker run -it --rm androidsdk/android-31:latest sdkmanager --list # list existing emulators - $ docker run -it --rm androidsdk/android-30:latest avdmanager list avd + $ docker run -it --rm androidsdk/android-31:latest avdmanager list avd # You can also run other Android platform tools, which are all added to the PATH environment variable ``` \ No newline at end of file diff --git a/tools/android-env.sh b/tools/android-env.sh index 6518535..34ceebe 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/30.0.2 +export PATH=${PATH}:${ANDROID_HOME}/build-tools/32.0.0 export PATH=${PATH}:${ANDROID_HOME}/platform-tools export PATH=${PATH}:${ANDROID_HOME}/emulator export PATH=${PATH}:${ANDROID_HOME}/bin