Skip to content

Update Android SDK tools and bundled binaries #5279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jardondiego wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −11
Open

Update Android SDK tools and bundled binaries #5279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions local/install_python_deps_linux.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,30 @@ source "$(${PYTHON} -m pipenv --venv)/bin/activate"

if [ $install_android_emulator ]; then
ANDROID_SDK_INSTALL_DIR=local/bin/android-sdk
ANDROID_SDK_REVISION=4333796
ANDROID_VERSION=28
ANDROID_TOOLS_BIN=$ANDROID_SDK_INSTALL_DIR/tools/bin/
ANDROID_SDK_REVISION=11076708
ANDROID_VERSION=34
ANDROID_TOOLS_BIN=$ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest/bin/

# Install the Android emulator and its dependencies. Used in tests and as an
# option during Android test case reproduction.
rm -rf $ANDROID_SDK_INSTALL_DIR
mkdir $ANDROID_SDK_INSTALL_DIR
curl https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_REVISION.zip \
--output $ANDROID_SDK_INSTALL_DIR/sdk-tools-linux.zip
unzip -d $ANDROID_SDK_INSTALL_DIR $ANDROID_SDK_INSTALL_DIR/sdk-tools-linux.zip
mkdir -p $ANDROID_SDK_INSTALL_DIR
curl https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_REVISION}_latest.zip \
--output $ANDROID_SDK_INSTALL_DIR/cmdline-tools.zip
unzip -d $ANDROID_SDK_INSTALL_DIR $ANDROID_SDK_INSTALL_DIR/cmdline-tools.zip

# The new cmdline-tools expects to be in a directory named 'latest' or 'version'
# to find its own root.
mv $ANDROID_SDK_INSTALL_DIR/cmdline-tools $ANDROID_SDK_INSTALL_DIR/temp
mkdir -p $ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest
mv $ANDROID_SDK_INSTALL_DIR/temp/* $ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest/
rm -rf $ANDROID_SDK_INSTALL_DIR/temp
Comment on lines +40 to +47
Copy link
Copy Markdown
Collaborator

@letitz letitz May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the archive only contains cmdline-tools at the root, then consider unzipping directly to a temp directory instead of unzipping to the target dir, then moving to a temp directory.

Suggested change
unzip -d $ANDROID_SDK_INSTALL_DIR $ANDROID_SDK_INSTALL_DIR/cmdline-tools.zip
# The new cmdline-tools expects to be in a directory named 'latest' or 'version'
# to find its own root.
mv $ANDROID_SDK_INSTALL_DIR/cmdline-tools $ANDROID_SDK_INSTALL_DIR/temp
mkdir -p $ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest
mv $ANDROID_SDK_INSTALL_DIR/temp/* $ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest/
rm -rf $ANDROID_SDK_INSTALL_DIR/temp
unzip -d $ANDROID_SDK_INSTALL_DIR/temp $ANDROID_SDK_INSTALL_DIR/cmdline-tools.zip
# The new cmdline-tools expects to be in a directory named 'latest' or 'version'
# to find its own root.
mv $ANDROID_SDK_INSTALL_DIR/{temp/cmdline-tools,cmdline-tools/latest}
rmdir $ANDROID_SDK_INSTALL_DIR/temp


yes | $ANDROID_TOOLS_BIN/sdkmanager --licenses
$ANDROID_TOOLS_BIN/sdkmanager "emulator"
$ANDROID_TOOLS_BIN/sdkmanager "platform-tools" "platforms;android-$ANDROID_VERSION"
$ANDROID_TOOLS_BIN/sdkmanager "system-images;android-$ANDROID_VERSION;google_apis;x86"
$ANDROID_TOOLS_BIN/sdkmanager --licenses
$ANDROID_TOOLS_BIN/avdmanager create avd --force -n TestImage -k "system-images;android-$ANDROID_VERSION;google_apis;x86"
$ANDROID_TOOLS_BIN/sdkmanager "platform-tools" "platforms;android-$ANDROID_VERSION" "build-tools;$ANDROID_VERSION.0.0"
$ANDROID_TOOLS_BIN/sdkmanager "system-images;android-$ANDROID_VERSION;google_apis;x86_64"
Copy link
Copy Markdown
Collaborator

@letitz letitz May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we switching from 32 bits to 64 here?

$ANDROID_TOOLS_BIN/avdmanager create avd --force -n TestImage -k "system-images;android-$ANDROID_VERSION;google_apis;x86_64"
fi

# Install other dependencies (e.g. bower).
Expand Down
Binary file modified resources/platform/android/adb
View file
Open in desktop
Binary file not shown.
Binary file modified resources/platform/android/fastboot
View file
Open in desktop
Binary file not shown.
Loading