Skip to content

Commit e70cad2

Browse files
committed
Support Windows sdkmanager.bat (#47874)
Summary: Pull Request resolved: #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
1 parent 9946838 commit e70cad2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ fun getSDKPath(): String {
3636
fun getSDKManagerPath(): String {
3737
val metaSdkManagerPath = File("${getSDKPath()}/cmdline-tools/latest/bin/sdkmanager")
3838
val ossSdkManagerPath = File("${getSDKPath()}/tools/bin/sdkmanager")
39+
val windowsMetaSdkManagerPath = File("${getSDKPath()}/cmdline-tools/latest/bin/sdkmanager.bat")
40+
val windowsOssSdkManagerPath = File("${getSDKPath()}/tools/bin/sdkmanager.bat")
3941
return when {
4042
metaSdkManagerPath.exists() -> metaSdkManagerPath.absolutePath
43+
windowsMetaSdkManagerPath.exists() -> windowsMetaSdkManagerPath.absolutePath
4144
ossSdkManagerPath.exists() -> ossSdkManagerPath.absolutePath
45+
windowsOssSdkManagerPath.exists() -> windowsOssSdkManagerPath.absolutePath
4246
else -> throw GradleException("Could not find sdkmanager executable.")
4347
}
4448
}

0 commit comments

Comments
 (0)