fix(ubuntu): specify all avd-related environment variables

on ubuntu-24 it seems that the AVD is not created where expected, so we force creation in the AVD home specifically it was in $HOME/.config/.android instead of $HOME/.android by setting all the AVD-related variables, avdmanager and emulator work additionally, we define an avdPath var but were not using it everywhere possible
ReactiveCircus · Oct 11, 2024 · 3ca67ba · 3ca67ba
1 parent 3a18f50
commit 3ca67ba
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/lib/emulator-manager.js b/lib/emulator-manager.js
@@ -51,19 +51,19 @@ function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, heapSiz
                 yield exec.exec(`sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --abi '${target}/${arch}' --package 'system-images;android-${apiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`);
             }
             if (cores) {
-                yield exec.exec(`sh -c \\"printf 'hw.cpu.ncore=${cores}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+                yield exec.exec(`sh -c \\"printf 'hw.cpu.ncore=${cores}\n' >> ${avdPath}"/config.ini`);
             }
             if (ramSize) {
-                yield exec.exec(`sh -c \\"printf 'hw.ramSize=${ramSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+                yield exec.exec(`sh -c \\"printf 'hw.ramSize=${ramSize}\n' >> ${avdPath}"/config.ini`);
             }
             if (heapSize) {
-                yield exec.exec(`sh -c \\"printf 'hw.heapSize=${heapSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+                yield exec.exec(`sh -c \\"printf 'hw.heapSize=${heapSize}\n' >> ${avdPath}"/config.ini`);
             }
             if (enableHardwareKeyboard) {
-                yield exec.exec(`sh -c \\"printf 'hw.keyboard=yes\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+                yield exec.exec(`sh -c \\"printf 'hw.keyboard=yes\n' >> ${avdPath}"/config.ini`);
             }
             if (diskSize) {
-                yield exec.exec(`sh -c \\"printf 'disk.dataPartition.size=${diskSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+                yield exec.exec(`sh -c \\"printf 'disk.dataPartition.size=${diskSize}\n' >> ${avdPath}"/config.ini`);
             }
             // turn off hardware acceleration on Linux
             if (process.platform === 'linux' && disableLinuxHardwareAcceleration) {

diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
@@ -67,8 +67,10 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
             }
             // add paths for commandline-tools and platform-tools
             core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
-            // set standard AVD path
-            core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);
+            // set standard AVD home and path variables
+            core.exportVariable('ANDROID_USER_HOME', `${process.env.HOME}/.android`);
+            core.exportVariable('ANDROID_EMULATOR_HOME', process.env.ANDROID_USER_HOME);
+            core.exportVariable('ANDROID_AVD_HOME', `${process.env.ANDROID_EMULATOR_HOME}/avd`);
             // accept all Android SDK licenses
             yield exec.exec(`sh -c \\"yes | sdkmanager --licenses > /dev/null"`);
             console.log('Installing latest build tools, platform tools, and platform.');

diff --git a/src/emulator-manager.ts b/src/emulator-manager.ts
@@ -38,23 +38,23 @@ export async function launchEmulator(
     }
 
     if (cores) {
-      await exec.exec(`sh -c \\"printf 'hw.cpu.ncore=${cores}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+      await exec.exec(`sh -c \\"printf 'hw.cpu.ncore=${cores}\n' >> ${avdPath}"/config.ini`);
     }
 
     if (ramSize) {
-      await exec.exec(`sh -c \\"printf 'hw.ramSize=${ramSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+      await exec.exec(`sh -c \\"printf 'hw.ramSize=${ramSize}\n' >> ${avdPath}"/config.ini`);
     }
 
     if (heapSize) {
-      await exec.exec(`sh -c \\"printf 'hw.heapSize=${heapSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+      await exec.exec(`sh -c \\"printf 'hw.heapSize=${heapSize}\n' >> ${avdPath}"/config.ini`);
     }
 
     if (enableHardwareKeyboard) {
-      await exec.exec(`sh -c \\"printf 'hw.keyboard=yes\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+      await exec.exec(`sh -c \\"printf 'hw.keyboard=yes\n' >> ${avdPath}"/config.ini`);
     }
 
     if (diskSize) {
-      await exec.exec(`sh -c \\"printf 'disk.dataPartition.size=${diskSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+      await exec.exec(`sh -c \\"printf 'disk.dataPartition.size=${diskSize}\n' >> ${avdPath}"/config.ini`);
     }
 
     // turn off hardware acceleration on Linux

diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
@@ -37,8 +37,10 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch:
     // add paths for commandline-tools and platform-tools
     core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
 
-    // set standard AVD path
-    core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);
+    // set standard AVD home and path variables
+    core.exportVariable('ANDROID_USER_HOME', `${process.env.HOME}/.android`);
+    core.exportVariable('ANDROID_EMULATOR_HOME', process.env.ANDROID_USER_HOME);
+    core.exportVariable('ANDROID_AVD_HOME', `${process.env.ANDROID_EMULATOR_HOME}/avd`);
 
     // accept all Android SDK licenses
     await exec.exec(`sh -c \\"yes | sdkmanager --licenses > /dev/null"`);