@@ -23,6 +23,8 @@ EMULATOR_SPEC="system-images;android-${ANDROID_API};default;${ANDROID_EMULATOR_A
2323EMULATOR_NAME=" swiftemu"
2424ANDROID_PROFILE=" Nexus 10"
2525ANDROID_EMULATOR_LAUNCH_TIMEOUT=300
26+ # TODO: require that this be set by an argument
27+ ANDROID_NDK_HOME=" ${ANDROID_NDK_HOME:- ${ANDROID_HOME} } "
2628
2729install_package () {
2830 # Detect package manager
@@ -53,13 +55,13 @@ log "Installing KVM"
5355# install_package qemu-kvm || install_package kvm || install_package @virt
5456# https://help.ubuntu.com/community/KVM/Installation
5557install_package qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils
56- sudo adduser ` id -un` libvirt
57- sudo adduser ` id -un` kvm
58- virsh list --all
59- ls -la /var/run/libvirt/libvirt-sock
60- ls -l /dev/kvm
61- rmmod kvm
62- modprobe -a kvm
58+ sudo adduser ` id -un` libvirt || true
59+ sudo adduser ` id -un` kvm || true
60+ virsh list --all || true
61+ ls -la /var/run/libvirt/libvirt-sock || true
62+ ls -l /dev/kvm || true
63+ rmmod kvm || true
64+ modprobe -a kvm || true
6365ls /etc/udev/rules.d/99-kvm4all.rules || true
6466
6567# download and install the Android SDK
128130cd .build/
129131cp -a debug/* .xctest " ${STAGING} "
130132cp -a debug/* .resources " ${STAGING} " || true
131- cp -a ${ANDROID_NDK_HOME} /toolchains/llvm/prebuilt/* /sysroot/usr/lib/${ANDROID_EMULATOR_ARCH_TRIPLE} -linux-android/libc++_shared.so " ${STAGING} "
132- cp -a ${SWIFT_ANDROID_SDK_HOME} /swift-android/swift-resources/usr/lib/swift-${ANDROID_EMULATOR_ARCH_TRIPLE} /android/* .so " ${STAGING} "
133+ cp -a " ${ANDROID_NDK_HOME} " /toolchains/llvm/prebuilt/* /sysroot/usr/lib/" ${ANDROID_EMULATOR_ARCH_TRIPLE} " -linux-android/libc++_shared.so " ${STAGING} "
134+ cp -a " ${SWIFT_ANDROID_SDK_HOME} " /swift-android/swift-resources/usr/lib/swift-" ${ANDROID_EMULATOR_ARCH_TRIPLE} " /android/* .so " ${STAGING} "
133135
134- adb push ${STAGING} /data/local/tmp/
136+ adb push " ${STAGING} " /data/local/tmp/
135137
136138cd -
137139
0 commit comments