|
5 | 5 | #
|
6 | 6 | # The MIT License (MIT)
|
7 | 7 | #
|
8 |
| -# Copyright (c) 2012-2024 HALX99 |
| 8 | +# Copyright (c) 2012-2025 HALX99 |
9 | 9 | #
|
10 | 10 | # Permission is hereby granted, free of charge, to any person obtaining a copy
|
11 | 11 | # of this software and associated documentation files (the "Software"), to deal
|
@@ -253,7 +253,10 @@ $cmake_generators = @{
|
253 | 253 | $channels = @{}
|
254 | 254 |
|
255 | 255 | # refer to: https://developer.android.com/studio#command-line-tools-only
|
256 |
| -$cmdlinetools_rev = '11076708' # 12.0 |
| 256 | +$cmdlinetools_revs = @{ |
| 257 | + '12.0' = '11076708' |
| 258 | + '19.0' = '13114758' |
| 259 | +} |
257 | 260 |
|
258 | 261 | $ndk_r23d_rev = '12186248'
|
259 | 262 | # $ndk_r25d_rev = '12161346'
|
@@ -563,6 +566,12 @@ if ([Regex]::Match($env:PATH, "`'|`"").Success) {
|
563 | 566 | throw "Please remove any `' or `" from your PATH list"
|
564 | 567 | }
|
565 | 568 |
|
| 569 | +# trim and get preferred version |
| 570 | +function trim_ver($pattern) { |
| 571 | + $vers = $pattern.Split('~') |
| 572 | + return $vers[$vers.Count -gt 1].TrimLast('+') |
| 573 | +} |
| 574 | + |
566 | 575 | # validate cmd follow symlink recurse
|
567 | 576 | function validate_cmd_fs($source, $root) {
|
568 | 577 | $fileinfo = Get-Item $source
|
@@ -1331,7 +1340,9 @@ function setup_android_sdk() {
|
1331 | 1340 | $sdk_comps = @()
|
1332 | 1341 |
|
1333 | 1342 | ### cmdline-tools ###
|
1334 |
| - $cmdlinetools_ver = $manifest['cmdlinetools'] |
| 1343 | + $cmdlinetools_ver = trim_ver $manifest['cmdlinetools'] |
| 1344 | + $cmdlinetools_rev = $cmdlinetools_revs[$cmdlinetools_ver] |
| 1345 | + |
1335 | 1346 | $sdkmanager_prog, $sdkmanager_ver = $null, $null
|
1336 | 1347 | $cmdlinetools_prefix = Join-Path $sdk_root "cmdline-tools"
|
1337 | 1348 | $cmdlinetools_bin = Join-Path $cmdlinetools_prefix "$cmdlinetools_ver/bin"
|
|
0 commit comments