mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Support Windows sdkmanager.bat (#47874)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/47874 We should be searching for the .bat file on Windows to remain compatible with some user setups. Changelog: [Android][Fixed] look for sdkmanager.bat Reviewed By: cipolleschi Differential Revision: D66295240 fbshipit-source-id: 6b79a9aa40f77ed9c5b3d6ad92b1a62e78159223
This commit is contained in:
committed by
Blake Friedman
parent
9946838bed
commit
e70cad24f0
@@ -36,9 +36,13 @@ fun getSDKPath(): String {
|
||||
fun getSDKManagerPath(): String {
|
||||
val metaSdkManagerPath = File("${getSDKPath()}/cmdline-tools/latest/bin/sdkmanager")
|
||||
val ossSdkManagerPath = File("${getSDKPath()}/tools/bin/sdkmanager")
|
||||
val windowsMetaSdkManagerPath = File("${getSDKPath()}/cmdline-tools/latest/bin/sdkmanager.bat")
|
||||
val windowsOssSdkManagerPath = File("${getSDKPath()}/tools/bin/sdkmanager.bat")
|
||||
return when {
|
||||
metaSdkManagerPath.exists() -> metaSdkManagerPath.absolutePath
|
||||
windowsMetaSdkManagerPath.exists() -> windowsMetaSdkManagerPath.absolutePath
|
||||
ossSdkManagerPath.exists() -> ossSdkManagerPath.absolutePath
|
||||
windowsOssSdkManagerPath.exists() -> windowsOssSdkManagerPath.absolutePath
|
||||
else -> throw GradleException("Could not find sdkmanager executable.")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user