Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit fe02dd1

Browse files
LeonScrogginsSkia Commit-Bot
LeonScroggins
authored and
Skia Commit-Bot
committed
Roll NDK to r21d
Bug: skia:10370 In android_ndk_windows/create.py, remove the code to remove a directory. This directory did not exist when I ran the script, leading to an Exception. Change-Id: I91aad3ff3738af99d425d334a11b6c60765e1c11 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298501 Reviewed-by: Mike Klein <[email protected]> Reviewed-by: Derek Sollenberger <[email protected]> Commit-Queue: Leon Scroggins <[email protected]>
1 parent 99a7e66 commit fe02dd1

File tree

7 files changed

+30
-35
lines changed

7 files changed

+30
-35
lines changed

‎infra/bots/assets/android_ndk_darwin/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9
1+
10

‎infra/bots/assets/android_ndk_darwin/create.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import shutil
1616
import subprocess
1717

18-
NDK_VER = "android-ndk-r20"
18+
NDK_VER = "android-ndk-r21d"
1919
NDK_URL = \
2020
"https://dl.google.com/android/repository/%s-darwin-x86_64.zip" % NDK_VER
2121

‎infra/bots/assets/android_ndk_linux/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
15
1+
16

‎infra/bots/assets/android_ndk_linux/create.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import shutil
1616
import subprocess
1717

18-
NDK_VER = "android-ndk-r20"
18+
NDK_VER = "android-ndk-r21d"
1919
NDK_URL = \
2020
"https://dl.google.com/android/repository/%s-linux-x86_64.zip" % NDK_VER
2121

‎infra/bots/assets/android_ndk_windows/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10
1+
11

‎infra/bots/assets/android_ndk_windows/create.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import shutil
1616
import subprocess
1717

18-
NDK_VER = "android-ndk-r20"
18+
NDK_VER = "android-ndk-r21d"
1919
NDK_URL = \
2020
"https://dl.google.com/android/repository/%s-windows-x86_64.zip" % NDK_VER
2121

@@ -27,11 +27,6 @@ def create_asset(target_dir):
2727
shutil.move(f, target_dir)
2828
subprocess.check_call(["rm", "ndk.zip"])
2929

30-
# Some of these files have paths that exceed 260 characters when downloaded
31-
# as a CIPD package. Luckily they're just tests. We don't need them.
32-
shutil.rmtree(os.path.join(target_dir,
33-
'sources', 'cxx-stl', 'llvm-libc++', 'test'))
34-
3530

3631
def main():
3732
parser = argparse.ArgumentParser()

‎infra/bots/tasks.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3331,7 +3331,7 @@
33313331
{
33323332
"name": "skia/bots/android_ndk_linux",
33333333
"path": "android_ndk_linux",
3334-
"version": "version:15"
3334+
"version": "version:16"
33353335
}
33363336
],
33373337
"command": [
@@ -3401,7 +3401,7 @@
34013401
{
34023402
"name": "skia/bots/android_ndk_linux",
34033403
"path": "android_ndk_linux",
3404-
"version": "version:15"
3404+
"version": "version:16"
34053405
}
34063406
],
34073407
"command": [
@@ -3471,7 +3471,7 @@
34713471
{
34723472
"name": "skia/bots/android_ndk_linux",
34733473
"path": "android_ndk_linux",
3474-
"version": "version:15"
3474+
"version": "version:16"
34753475
}
34763476
],
34773477
"command": [
@@ -3541,7 +3541,7 @@
35413541
{
35423542
"name": "skia/bots/android_ndk_linux",
35433543
"path": "android_ndk_linux",
3544-
"version": "version:15"
3544+
"version": "version:16"
35453545
}
35463546
],
35473547
"command": [
@@ -3691,7 +3691,7 @@
36913691
{
36923692
"name": "skia/bots/android_ndk_linux",
36933693
"path": "android_ndk_linux",
3694-
"version": "version:15"
3694+
"version": "version:16"
36953695
}
36963696
],
36973697
"command": [
@@ -3761,7 +3761,7 @@
37613761
{
37623762
"name": "skia/bots/android_ndk_linux",
37633763
"path": "android_ndk_linux",
3764-
"version": "version:15"
3764+
"version": "version:16"
37653765
}
37663766
],
37673767
"command": [
@@ -3831,7 +3831,7 @@
38313831
{
38323832
"name": "skia/bots/android_ndk_linux",
38333833
"path": "android_ndk_linux",
3834-
"version": "version:15"
3834+
"version": "version:16"
38353835
}
38363836
],
38373837
"command": [
@@ -3981,7 +3981,7 @@
39813981
{
39823982
"name": "skia/bots/android_ndk_linux",
39833983
"path": "android_ndk_linux",
3984-
"version": "version:15"
3984+
"version": "version:16"
39853985
}
39863986
],
39873987
"command": [
@@ -4051,7 +4051,7 @@
40514051
{
40524052
"name": "skia/bots/android_ndk_linux",
40534053
"path": "android_ndk_linux",
4054-
"version": "version:15"
4054+
"version": "version:16"
40554055
}
40564056
],
40574057
"command": [
@@ -4121,7 +4121,7 @@
41214121
{
41224122
"name": "skia/bots/android_ndk_linux",
41234123
"path": "android_ndk_linux",
4124-
"version": "version:15"
4124+
"version": "version:16"
41254125
}
41264126
],
41274127
"command": [
@@ -4191,7 +4191,7 @@
41914191
{
41924192
"name": "skia/bots/android_ndk_linux",
41934193
"path": "android_ndk_linux",
4194-
"version": "version:15"
4194+
"version": "version:16"
41954195
}
41964196
],
41974197
"command": [
@@ -4261,7 +4261,7 @@
42614261
{
42624262
"name": "skia/bots/android_ndk_linux",
42634263
"path": "android_ndk_linux",
4264-
"version": "version:15"
4264+
"version": "version:16"
42654265
}
42664266
],
42674267
"command": [
@@ -4331,7 +4331,7 @@
43314331
{
43324332
"name": "skia/bots/android_ndk_linux",
43334333
"path": "android_ndk_linux",
4334-
"version": "version:15"
4334+
"version": "version:16"
43354335
}
43364336
],
43374337
"command": [
@@ -4401,7 +4401,7 @@
44014401
{
44024402
"name": "skia/bots/android_ndk_linux",
44034403
"path": "android_ndk_linux",
4404-
"version": "version:15"
4404+
"version": "version:16"
44054405
}
44064406
],
44074407
"command": [
@@ -4639,7 +4639,7 @@
46394639
{
46404640
"name": "skia/bots/android_ndk_linux",
46414641
"path": "android_ndk_linux",
4642-
"version": "version:15"
4642+
"version": "version:16"
46434643
}
46444644
],
46454645
"command": [
@@ -4709,7 +4709,7 @@
47094709
{
47104710
"name": "skia/bots/android_ndk_linux",
47114711
"path": "android_ndk_linux",
4712-
"version": "version:15"
4712+
"version": "version:16"
47134713
}
47144714
],
47154715
"command": [
@@ -4858,7 +4858,7 @@
48584858
{
48594859
"name": "skia/bots/android_ndk_linux",
48604860
"path": "android_ndk_linux",
4861-
"version": "version:15"
4861+
"version": "version:16"
48624862
}
48634863
],
48644864
"command": [
@@ -4928,7 +4928,7 @@
49284928
{
49294929
"name": "skia/bots/android_ndk_linux",
49304930
"path": "android_ndk_linux",
4931-
"version": "version:15"
4931+
"version": "version:16"
49324932
}
49334933
],
49344934
"command": [
@@ -4998,7 +4998,7 @@
49984998
{
49994999
"name": "skia/bots/android_ndk_linux",
50005000
"path": "android_ndk_linux",
5001-
"version": "version:15"
5001+
"version": "version:16"
50025002
}
50035003
],
50045004
"command": [
@@ -5068,7 +5068,7 @@
50685068
{
50695069
"name": "skia/bots/android_ndk_linux",
50705070
"path": "android_ndk_linux",
5071-
"version": "version:15"
5071+
"version": "version:16"
50725072
}
50735073
],
50745074
"command": [
@@ -9048,7 +9048,7 @@
90489048
{
90499049
"name": "skia/bots/android_ndk_linux",
90509050
"path": "android_ndk_linux",
9051-
"version": "version:15"
9051+
"version": "version:16"
90529052
}
90539053
],
90549054
"command": [
@@ -9452,7 +9452,7 @@
94529452
{
94539453
"name": "skia/bots/android_ndk_darwin",
94549454
"path": "android_ndk_darwin",
9455-
"version": "version:9"
9455+
"version": "version:10"
94569456
}
94579457
],
94589458
"command": [
@@ -11219,7 +11219,7 @@
1121911219
{
1122011220
"name": "skia/bots/android_ndk_windows",
1122111221
"path": "n",
11222-
"version": "version:10"
11222+
"version": "version:11"
1122311223
}
1122411224
],
1122511225
"command": [
@@ -15433,7 +15433,7 @@
1543315433
{
1543415434
"name": "skia/bots/android_ndk_linux",
1543515435
"path": "android_ndk_linux",
15436-
"version": "version:15"
15436+
"version": "version:16"
1543715437
}
1543815438
],
1543915439
"command": [

0 commit comments

Comments
 (0)