Skip to content

Commit c97c292

Browse files
committed
Try installing KVM
1 parent f0a2e91 commit c97c292

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ EMULATOR_SPEC="system-images;android-${ANDROID_API};default;${ANDROID_EMULATOR_A
2323
EMULATOR_NAME="swiftemu"
2424
ANDROID_PROFILE="Nexus 10"
2525
ANDROID_EMULATOR_LAUNCH_TIMEOUT=300
26-
# TODO: require that this be set by an argument
27-
ANDROID_NDK_HOME="${ANDROID_NDK_HOME:-${ANDROID_HOME}}"
2826

2927
install_package() {
3028
# Detect package manager
@@ -55,8 +53,8 @@ log "Installing KVM"
5553
#install_package qemu-kvm || install_package kvm || install_package @virt
5654
# https://help.ubuntu.com/community/KVM/Installation
5755
install_package qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils
58-
sudo adduser `id -un` libvirt || true
59-
sudo adduser `id -un` kvm || true
56+
sudo adduser "$(id -un)" libvirt || true
57+
sudo adduser "$(id -un)" kvm || true
6058
virsh list --all || true
6159
ls -la /var/run/libvirt/libvirt-sock || true
6260
ls -l /dev/kvm || true
@@ -69,6 +67,9 @@ log "Installing Android cmdline-tools"
6967
mkdir ~/android-sdk
7068
pushd ~/android-sdk
7169
export ANDROID_HOME=${PWD}
70+
# TODO: require that this be set by an argument
71+
export ANDROID_NDK_HOME="${ANDROID_NDK_HOME:-${ANDROID_HOME}}"
72+
7273
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
7374
unzip commandlinetools.zip
7475
mv cmdline-tools latest

0 commit comments

Comments
 (0)