mirror of
https://gitea.com/actions/setup-android.git
synced 2025-12-12 19:36:59 +00:00
Call sdkmanager, not .bat on windows too, it just works
This commit is contained in:
committed by
Dave Olsthoorn
parent
1edf194eee
commit
6bde8445cd
@@ -19,16 +19,13 @@ const ANDROID_SDK_ROOT = process.env['ANDROID_SDK_ROOT'] || ANDROID_HOME_SDK_DIR
|
|||||||
const ANDROID_REPOSITORIES_CFG = path.join(ANDROID_SDK_ROOT, 'repositories.cfg')
|
const ANDROID_REPOSITORIES_CFG = path.join(ANDROID_SDK_ROOT, 'repositories.cfg')
|
||||||
|
|
||||||
function getSdkManagerPath(cmdToolsVersion: string): string {
|
function getSdkManagerPath(cmdToolsVersion: string): string {
|
||||||
const toolsBinDir = path.join(
|
return path.join(
|
||||||
ANDROID_SDK_ROOT,
|
ANDROID_SDK_ROOT,
|
||||||
'cmdline-tools',
|
'cmdline-tools',
|
||||||
cmdToolsVersion,
|
cmdToolsVersion,
|
||||||
'bin'
|
'bin',
|
||||||
|
'sdkmanager'
|
||||||
)
|
)
|
||||||
if ('win32' === process.platform) {
|
|
||||||
return path.join(toolsBinDir, 'sdkmanager.bat')
|
|
||||||
}
|
|
||||||
return path.join(toolsBinDir, 'sdkmanager')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function findPreinstalledSdkManager(): {
|
function findPreinstalledSdkManager(): {
|
||||||
|
|||||||
Reference in New Issue
Block a user