From 1b985f4c7ade04ac6f5983bbcac52ad473eee582 Mon Sep 17 00:00:00 2001 From: Justin Brooks Date: Fri, 4 Oct 2024 22:53:35 -0400 Subject: [PATCH] Avoid changing the owner of unnecessary files (#406) * Avoid changing the owner of unnecessary files Source files shouldn't matter for the purposes of this tool. % ls -R $ANDROID_HOME/sources/android-34 | wc -l 17750 * Remove non-existant directory * Avoid another unnecessary chown * Push js --- lib/sdk-installer.js | 4 +++- src/sdk-installer.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index c57dea95..89839b27 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -53,7 +53,9 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk const isOnMac = process.platform === 'darwin'; const isArm = process.arch === 'arm64'; 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}/platform-tools -R`); + yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/cmdline-tools/latest -R`); + yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION} -R`); } const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`; if (!fs.existsSync(cmdlineToolsPath)) { diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index 164fb395..2b736477 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -20,7 +20,9 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch: const isArm = process.arch === 'arm64'; if (!isOnMac) { - await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`); + await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/platform-tools -R`); + await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/cmdline-tools/latest -R`); + await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION} -R`); } const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`;