Skip to content

Commit 5a481d2

Browse files
committed
Check in updated *.js file.
1 parent f72f505 commit 5a481d2

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

lib/sdk-installer.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
5151
try {
5252
console.log(`::group::Install Android SDK`);
5353
const isOnMac = process.platform === 'darwin';
54+
const isArm = process.arch === 'arm64';
5455
if (!isOnMac) {
5556
yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`);
5657
}
@@ -75,7 +76,22 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
7576
if (emulatorBuild) {
7677
console.log(`Installing emulator build ${emulatorBuild}.`);
7778
// TODO find out the correct download URLs for all build ids
78-
const downloadUrlSuffix = Number(emulatorBuild.charAt(0)) > 6 ? `_x64-${emulatorBuild}` : `-${emulatorBuild}`;
79+
var downloadUrlSuffix;
80+
const majorBuildVersion = Number(emulatorBuild);
81+
if (majorBuildVersion >= 8000000) {
82+
if (isArm) {
83+
downloadUrlSuffix = `_aarch64-${emulatorBuild}`;
84+
}
85+
else {
86+
downloadUrlSuffix = `_x64-${emulatorBuild}`;
87+
}
88+
}
89+
else if (majorBuildVersion >= 7000000) {
90+
downloadUrlSuffix = `_x64-${emulatorBuild}`;
91+
}
92+
else {
93+
downloadUrlSuffix = `-${emulatorBuild}`;
94+
}
7995
yield exec.exec(`curl -fo emulator.zip https://dl.google.com/android/repository/emulator-${isOnMac ? 'darwin' : 'linux'}${downloadUrlSuffix}.zip`);
8096
yield exec.exec(`unzip -o -q emulator.zip -d ${process.env.ANDROID_HOME}`);
8197
yield io.rmRF('emulator.zip');

0 commit comments

Comments
 (0)