Skip to content

Commit 1e9bf25

Browse files
committed
Install Android SDK using package manager
1 parent b7e9a5d commit 1e9bf25

1 file changed

Lines changed: 26 additions & 13 deletions

File tree

.github/workflows/scripts/android/android-emulator-tests.sh

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,34 @@ EMULATOR_SPEC="system-images;android-${ANDROID_API};default;${ANDROID_EMULATOR_A
2323
EMULATOR_NAME="swiftemu"
2424
ANDROID_PROFILE="Pixel 6"
2525

26-
# download and install the Android SDK
27-
mkdir ~/android-sdk
28-
cd ~/android-sdk
29-
curl --connect-timeout 30 --retry 3 --retry-delay 2 --retry-max-time 60 -fsSL -o commandlinetools.zip https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip
30-
unzip commandlinetools.zip
31-
32-
echo "CHECKING FOR ANDROID SDK"
33-
find . -type f -name sdkmanager || true
34-
echo "DONE CHECKING FOR ANDROID SDK"
35-
36-
export PATH=${PATH}:${PWD}/cmdline-tools/bin
26+
install_package() {
27+
# Detect package manager
28+
if command -v apt >/dev/null 2>&1; then
29+
INSTALL_PACKAGE_COMMAND="apt update -q && apt install -yq"
30+
elif command -v dnf >/dev/null 2>&1; then
31+
INSTALL_PACKAGE_COMMAND="dnf install -y"
32+
elif command -v yum >/dev/null 2>&1; then
33+
INSTALL_PACKAGE_COMMAND="yum install -y"
34+
else
35+
fatal "No supported package manager found"
36+
fi
37+
eval "$INSTALL_PACKAGE_COMMAND $1"
38+
}
39+
40+
install_package android-sdk
3741

42+
# download and install the Android SDK
43+
#mkdir ~/android-sdk
44+
#cd ~/android-sdk
45+
#curl --connect-timeout 30 --retry 3 --retry-delay 2 --retry-max-time 60 -fsSL -o commandlinetools.zip https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip
46+
#unzip commandlinetools.zip
47+
48+
#echo "CHECKING FOR ANDROID SDK"
49+
#find . -type f -name sdkmanager || true
50+
#echo "DONE CHECKING FOR ANDROID SDK"
51+
#export PATH=${PATH}:${PWD}/cmdline-tools/bin
3852
#export ANDROID_HOME=${PWD}
39-
40-
cd -
53+
#cd -
4154

4255
# install and start an Android emulator
4356
sdkmanager --list_installed

0 commit comments

Comments
 (0)