mirror of
https://github.com/reactivecircus/android-emulator-runner.git
synced 2026-09-06 11:49:32 +00:00
Check in updated *.js file.
This commit is contained in:
+17
-1
@@ -51,6 +51,7 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
|
|||||||
try {
|
try {
|
||||||
console.log(`::group::Install Android SDK`);
|
console.log(`::group::Install Android SDK`);
|
||||||
const isOnMac = process.platform === 'darwin';
|
const isOnMac = process.platform === 'darwin';
|
||||||
|
const isArm = process.arch === 'arm64';
|
||||||
if (!isOnMac) {
|
if (!isOnMac) {
|
||||||
yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`);
|
yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`);
|
||||||
}
|
}
|
||||||
@@ -75,7 +76,22 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
|
|||||||
if (emulatorBuild) {
|
if (emulatorBuild) {
|
||||||
console.log(`Installing emulator build ${emulatorBuild}.`);
|
console.log(`Installing emulator build ${emulatorBuild}.`);
|
||||||
// TODO find out the correct download URLs for all build ids
|
// TODO find out the correct download URLs for all build ids
|
||||||
const downloadUrlSuffix = Number(emulatorBuild.charAt(0)) > 6 ? `_x64-${emulatorBuild}` : `-${emulatorBuild}`;
|
var downloadUrlSuffix;
|
||||||
|
const majorBuildVersion = Number(emulatorBuild);
|
||||||
|
if (majorBuildVersion >= 8000000) {
|
||||||
|
if (isArm) {
|
||||||
|
downloadUrlSuffix = `_aarch64-${emulatorBuild}`;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
downloadUrlSuffix = `_x64-${emulatorBuild}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (majorBuildVersion >= 7000000) {
|
||||||
|
downloadUrlSuffix = `_x64-${emulatorBuild}`;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
downloadUrlSuffix = `-${emulatorBuild}`;
|
||||||
|
}
|
||||||
yield exec.exec(`curl -fo emulator.zip https://dl.google.com/android/repository/emulator-${isOnMac ? 'darwin' : 'linux'}${downloadUrlSuffix}.zip`);
|
yield exec.exec(`curl -fo emulator.zip https://dl.google.com/android/repository/emulator-${isOnMac ? 'darwin' : 'linux'}${downloadUrlSuffix}.zip`);
|
||||||
yield exec.exec(`unzip -o -q emulator.zip -d ${process.env.ANDROID_HOME}`);
|
yield exec.exec(`unzip -o -q emulator.zip -d ${process.env.ANDROID_HOME}`);
|
||||||
yield io.rmRF('emulator.zip');
|
yield io.rmRF('emulator.zip');
|
||||||
|
|||||||
Reference in New Issue
Block a user