From a51cec297685ac44272f0c1a0b94c76d71f210b9 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 27 Sep 2024 13:18:49 -0300 Subject: [PATCH] Only overwrite ANDROID_AVD_HOME if not set The path might point to a different path than what android-emulator-runner expects, like when XDG_CONFIG_HOME is set. --- src/sdk-installer.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index 164fb3953..15854ab09 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -35,8 +35,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 path if not set + if (!process.env.ANDROID_AVD_HOME) { + core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`); + } // accept all Android SDK licenses await exec.exec(`sh -c \\"yes | sdkmanager --licenses > /dev/null"`);