Skip to content

Commit 31a3cca

Browse files
kevinjeon-gmattgodbolt
kevinjeon-g
authored and
mattgodbolt
committed
Update Android compilers (compiler-explorer#7294)
This change adds recent ART mainline releases (version 35) and R8 versions (8.6, 8.7).
1 parent 525b80d commit 31a3cca

File tree

2 files changed

+139
-11
lines changed

2 files changed

+139
-11
lines changed

‎etc/config/android-java.amazon.properties‎

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
compilers=&android-d8:&android-r8:&dex2oat:&android-openjdk
22

3-
group.android-d8.compilers=java-d8-8156:java-d8-8172:java-d8-8233:java-d8-8242:java-d8-8247:java-d8-8336:java-d8-8337:java-d8-8510:java-d8-8527:java-d8-8535
3+
group.android-d8.compilers=java-d8-8156:java-d8-8172:java-d8-8233:java-d8-8242:java-d8-8247:java-d8-8336:java-d8-8337:java-d8-8510:java-d8-8527:java-d8-8535:java-d8-8617:java-d8-8627:java-d8-8714:java-d8-8718
44
group.android-d8.compilerType=android-d8
55
group.android-d8.isSemVer=true
66
group.android-d8.objdumper=/opt/compiler-explorer/baksmali-3.0.3/baksmali-3.0.3-fat.jar
77
group.android-d8.javaId=java1601
88
group.android-d8.kotlinId=kotlinc1920
99
group.android-d8.instructionSet=dex
1010

11+
compiler.java-d8-8718.name=d8 8.7.18
12+
compiler.java-d8-8718.exe=/opt/compiler-explorer/r8-8.7.18/r8-8.7.18.jar
13+
14+
compiler.java-d8-8714.name=d8 8.7.14
15+
compiler.java-d8-8714.exe=/opt/compiler-explorer/r8-8.7.14/r8-8.7.14.jar
16+
17+
compiler.java-d8-8627.name=d8 8.6.27
18+
compiler.java-d8-8627.exe=/opt/compiler-explorer/r8-8.6.27/r8-8.6.27.jar
19+
20+
compiler.java-d8-8617.name=d8 8.6.17
21+
compiler.java-d8-8617.exe=/opt/compiler-explorer/r8-8.6.17/r8-8.6.17.jar
22+
1123
compiler.java-d8-8535.name=d8 8.5.35
1224
compiler.java-d8-8535.exe=/opt/compiler-explorer/r8-8.5.35/r8-8.5.35.jar
1325

@@ -38,13 +50,25 @@ compiler.java-d8-8172.exe=/opt/compiler-explorer/r8-8.1.72/r8-8.1.72.jar
3850
compiler.java-d8-8156.name=d8 8.1.56
3951
compiler.java-d8-8156.exe=/opt/compiler-explorer/r8-8.1.56/r8-8.1.56.jar
4052

41-
group.android-r8.compilers=java-r8-8233:java-r8-8242:java-r8-8247:java-r8-8336:java-r8-8337:java-r8-8510:java-r8-8527:java-r8-8535
53+
group.android-r8.compilers=java-r8-8233:java-r8-8242:java-r8-8247:java-r8-8336:java-r8-8337:java-r8-8510:java-r8-8527:java-r8-8535:java-r8-8617:java-r8-8627:java-r8-8714:java-r8-8718
4254
group.android-r8.compilerType=android-r8
4355
group.android-r8.isSemVer=true
4456
group.android-r8.objdumper=/opt/compiler-explorer/baksmali-3.0.3/baksmali-3.0.3-fat.jar
4557
group.android-r8.javaId=java1601
4658
group.android-r8.kotlinId=kotlinc1920
4759

60+
compiler.java-r8-8718.name=r8 8.7.18
61+
compiler.java-r8-8718.exe=/opt/compiler-explorer/r8-8.7.18/r8-8.7.18.jar
62+
63+
compiler.java-r8-8714.name=r8 8.7.14
64+
compiler.java-r8-8714.exe=/opt/compiler-explorer/r8-8.7.14/r8-8.7.14.jar
65+
66+
compiler.java-r8-8627.name=r8 8.6.27
67+
compiler.java-r8-8627.exe=/opt/compiler-explorer/r8-8.6.27/r8-8.6.27.jar
68+
69+
compiler.java-r8-8617.name=r8 8.6.17
70+
compiler.java-r8-8617.exe=/opt/compiler-explorer/r8-8.6.17/r8-8.6.17.jar
71+
4872
compiler.java-r8-8535.name=r8 8.5.35
4973
compiler.java-r8-8535.exe=/opt/compiler-explorer/r8-8.5.35/r8-8.5.35.jar
5074

@@ -69,7 +93,7 @@ compiler.java-r8-8242.exe=/opt/compiler-explorer/r8-8.2.42/r8-8.2.42.jar
6993
compiler.java-r8-8233.name=r8 8.2.33
7094
compiler.java-r8-8233.exe=/opt/compiler-explorer/r8-8.2.33/r8-8.2.33.jar
7195

72-
group.dex2oat.compilers=java-dex2oat-latest:java-dex2oat-3310:java-dex2oat-3411:java-dex2oat-3413:java-dex2oat-3414:java-dex2oat-3415:java-dex2oat-3416:java-dex2oat-3417:java-dex2oat-3418
96+
group.dex2oat.compilers=java-dex2oat-latest:java-dex2oat-3310:java-dex2oat-3411:java-dex2oat-3413:java-dex2oat-3414:java-dex2oat-3415:java-dex2oat-3416:java-dex2oat-3417:java-dex2oat-3418:java-dex2oat-3508:java-dex2oat-3509:java-dex2oat-3510:java-dex2oat-3511
7397
group.dex2oat.groupName=ART
7498
group.dex2oat.compilerType=dex2oat
7599
group.dex2oat.isSemVer=true
@@ -79,10 +103,38 @@ compiler.java-dex2oat-latest.name=ART dex2oat latest
79103
compiler.java-dex2oat-latest.artArtifactDir=/opt/compiler-explorer/dex2oat-latest
80104
compiler.java-dex2oat-latest.exe=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/dex2oat64
81105
compiler.java-dex2oat-latest.objdumper=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/oatdump
82-
compiler.java-dex2oat-latest.d8Id=java-d8-8535
106+
compiler.java-dex2oat-latest.d8Id=java-d8-8718
83107
compiler.java-dex2oat-latest.isNightly=true
84108
compiler.java-dex2oat-latest.profmanPath=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/profman
85109

110+
compiler.java-dex2oat-3511.name=ART dex2oat aml_art_351110180 (Nov 2024)
111+
compiler.java-dex2oat-3511.artArtifactDir=/opt/compiler-explorer/dex2oat-35.11
112+
compiler.java-dex2oat-3511.exe=/opt/compiler-explorer/dex2oat-35.11/x86_64/bin/dex2oat64
113+
compiler.java-dex2oat-3511.objdumper=/opt/compiler-explorer/dex2oat-35.11/x86_64/bin/oatdump
114+
compiler.java-dex2oat-3511.d8Id=java-d8-8718
115+
compiler.java-dex2oat-3511.profmanPath=/opt/compiler-explorer/dex2oat-35.11/x86_64/bin/profman
116+
117+
compiler.java-dex2oat-3510.name=ART dex2oat aml_art_351011240 (Oct 2024)
118+
compiler.java-dex2oat-3510.artArtifactDir=/opt/compiler-explorer/dex2oat-35.10
119+
compiler.java-dex2oat-3510.exe=/opt/compiler-explorer/dex2oat-35.10/x86_64/bin/dex2oat64
120+
compiler.java-dex2oat-3510.objdumper=/opt/compiler-explorer/dex2oat-35.10/x86_64/bin/oatdump
121+
compiler.java-dex2oat-3510.d8Id=java-d8-8718
122+
compiler.java-dex2oat-3510.profmanPath=/opt/compiler-explorer/dex2oat-35.10/x86_64/bin/profman
123+
124+
compiler.java-dex2oat-3509.name=ART dex2oat aml_art_350913340 (Sep 2024)
125+
compiler.java-dex2oat-3509.artArtifactDir=/opt/compiler-explorer/dex2oat-35.9
126+
compiler.java-dex2oat-3509.exe=/opt/compiler-explorer/dex2oat-35.9/x86_64/bin/dex2oat64
127+
compiler.java-dex2oat-3509.objdumper=/opt/compiler-explorer/dex2oat-35.9/x86_64/bin/oatdump
128+
compiler.java-dex2oat-3509.d8Id=java-d8-8718
129+
compiler.java-dex2oat-3509.profmanPath=/opt/compiler-explorer/dex2oat-35.9/x86_64/bin/profman
130+
131+
compiler.java-dex2oat-3508.name=ART dex2oat aml_art_350820960 (Aug 2024)
132+
compiler.java-dex2oat-3508.artArtifactDir=/opt/compiler-explorer/dex2oat-35.8
133+
compiler.java-dex2oat-3508.exe=/opt/compiler-explorer/dex2oat-35.8/x86_64/bin/dex2oat64
134+
compiler.java-dex2oat-3508.objdumper=/opt/compiler-explorer/dex2oat-35.8/x86_64/bin/oatdump
135+
compiler.java-dex2oat-3508.d8Id=java-d8-8718
136+
compiler.java-dex2oat-3508.profmanPath=/opt/compiler-explorer/dex2oat-35.8/x86_64/bin/profman
137+
86138
compiler.java-dex2oat-3418.name=ART dex2oat aml_art_341810020 (Jun 2024)
87139
compiler.java-dex2oat-3418.artArtifactDir=/opt/compiler-explorer/dex2oat-34.18
88140
compiler.java-dex2oat-3418.exe=/opt/compiler-explorer/dex2oat-34.18/x86_64/bin/dex2oat64
@@ -248,9 +300,21 @@ libs.android-api-stubs.versions.11662386.version=11662386
248300
libs.android-api-stubs.versions.11662386.path=/opt/compiler-explorer/android-api-stubs-11662386/android.jar
249301

250302
libs.r8-keepanno.name=R8 keep-annotations
251-
libs.r8-keepanno.versions=8233:8242:8247:8336:8337:8510:8527:8535
303+
libs.r8-keepanno.versions=8233:8242:8247:8336:8337:8510:8527:8535:8617:8627:8714:8718
252304
libs.r8-keepanno.url=https://r8.googlesource.com/r8/+/refs/heads/main/doc/keepanno-guide.md
253305

306+
libs.r8-keepanno.versions.8718.version=8.7.18
307+
libs.r8-keepanno.versions.8718.path=/opt/compiler-explorer/r8-8.7.18-keepanno/keepanno-annotations.jar
308+
309+
libs.r8-keepanno.versions.8714.version=8.7.14
310+
libs.r8-keepanno.versions.8714.path=/opt/compiler-explorer/r8-8.7.14-keepanno/keepanno-annotations.jar
311+
312+
libs.r8-keepanno.versions.8627.version=8.6.27
313+
libs.r8-keepanno.versions.8627.path=/opt/compiler-explorer/r8-8.6.27-keepanno/keepanno-annotations.jar
314+
315+
libs.r8-keepanno.versions.8617.version=8.6.17
316+
libs.r8-keepanno.versions.8617.path=/opt/compiler-explorer/r8-8.6.17-keepanno/keepanno-annotations.jar
317+
254318
libs.r8-keepanno.versions.8535.version=8.5.35
255319
libs.r8-keepanno.versions.8535.path=/opt/compiler-explorer/r8-8.5.35-keepanno/keepanno-annotations.jar
256320

@@ -304,4 +368,4 @@ libs.androidx-annotation.versions.191.version=1.9.1
304368
libs.androidx-annotation.versions.191.path=/opt/compiler-explorer/androidx-annotation-1.9.1/annotation-jvm.jar
305369

306370

307-
defaultLibs=android-api-stubs.11662386:r8-keepanno.8535:androidx-annotation.versions.191
371+
defaultLibs=android-api-stubs.11662386:r8-keepanno.8718:androidx-annotation.versions.191

‎etc/config/android-kotlin.amazon.properties‎

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
compilers=&android-d8:&android-r8:&dex2oat:&android-kotlinc
22

3-
group.android-d8.compilers=kotlin-d8-8156:kotlin-d8-8172:kotlin-d8-8233:kotlin-d8-8242:kotlin-d8-8247:kotlin-d8-8336:kotlin-d8-8337:kotlin-d8-8510:kotlin-d8-8527:kotlin-d8-8535
3+
group.android-d8.compilers=kotlin-d8-8156:kotlin-d8-8172:kotlin-d8-8233:kotlin-d8-8242:kotlin-d8-8247:kotlin-d8-8336:kotlin-d8-8337:kotlin-d8-8510:kotlin-d8-8527:kotlin-d8-8535:kotlin-d8-8617:kotlin-d8-8627:kotlin-d8-8714:kotlin-d8-8718
44
group.android-d8.compilerType=android-d8
55
group.android-d8.isSemVer=true
66
group.android-d8.objdumper=/opt/compiler-explorer/baksmali-3.0.3/baksmali-3.0.3-fat.jar
77
group.android-d8.javaId=java1601
88
group.android-d8.kotlinId=kotlinc1920
99
group.android-d8.instructionSet=dex
1010

11+
compiler.kotlin-d8-8718.name=d8 8.7.18
12+
compiler.kotlin-d8-8718.exe=/opt/compiler-explorer/r8-8.7.18/r8-8.7.18.jar
13+
14+
compiler.kotlin-d8-8714.name=d8 8.7.14
15+
compiler.kotlin-d8-8714.exe=/opt/compiler-explorer/r8-8.7.14/r8-8.7.14.jar
16+
17+
compiler.kotlin-d8-8627.name=d8 8.6.27
18+
compiler.kotlin-d8-8627.exe=/opt/compiler-explorer/r8-8.6.27/r8-8.6.27.jar
19+
20+
compiler.kotlin-d8-8617.name=d8 8.6.17
21+
compiler.kotlin-d8-8617.exe=/opt/compiler-explorer/r8-8.6.17/r8-8.6.17.jar
22+
1123
compiler.kotlin-d8-8535.name=d8 8.5.35
1224
compiler.kotlin-d8-8535.exe=/opt/compiler-explorer/r8-8.5.35/r8-8.5.35.jar
1325

@@ -38,14 +50,26 @@ compiler.kotlin-d8-8172.exe=/opt/compiler-explorer/r8-8.1.72/r8-8.1.72.jar
3850
compiler.kotlin-d8-8156.name=d8 8.1.56
3951
compiler.kotlin-d8-8156.exe=/opt/compiler-explorer/r8-8.1.56/r8-8.1.56.jar
4052

41-
group.android-r8.compilers=kotlin-r8-8233:kotlin-r8-8242:kotlin-r8-8247:kotlin-r8-8336:kotlin-r8-8337:kotlin-r8-8510:kotlin-r8-8527:kotlin-r8-8535
53+
group.android-r8.compilers=kotlin-r8-8233:kotlin-r8-8242:kotlin-r8-8247:kotlin-r8-8336:kotlin-r8-8337:kotlin-r8-8510:kotlin-r8-8527:kotlin-r8-8535:kotlin-r8-8617:kotlin-r8-8627:kotlin-r8-8714:kotlin-r8-8718
4254
group.android-r8.compilerType=android-r8
4355
group.android-r8.isSemVer=true
4456
group.android-r8.objdumper=/opt/compiler-explorer/baksmali-3.0.3/baksmali-3.0.3-fat.jar
4557
group.android-r8.javaId=java1601
4658
group.android-r8.kotlinId=kotlinc1920
4759
group.android-r8.kotlinLibPath=/opt/compiler-explorer/kotlin-jvm-1.9.20/lib
4860

61+
compiler.kotlin-r8-8718.name=r8 8.7.18
62+
compiler.kotlin-r8-8718.exe=/opt/compiler-explorer/r8-8.7.18/r8-8.7.18.jar
63+
64+
compiler.kotlin-r8-8714.name=r8 8.7.14
65+
compiler.kotlin-r8-8714.exe=/opt/compiler-explorer/r8-8.7.14/r8-8.7.14.jar
66+
67+
compiler.kotlin-r8-8627.name=r8 8.6.27
68+
compiler.kotlin-r8-8627.exe=/opt/compiler-explorer/r8-8.6.27/r8-8.6.27.jar
69+
70+
compiler.kotlin-r8-8617.name=r8 8.6.17
71+
compiler.kotlin-r8-8617.exe=/opt/compiler-explorer/r8-8.6.17/r8-8.6.17.jar
72+
4973
compiler.kotlin-r8-8535.name=r8 8.5.35
5074
compiler.kotlin-r8-8535.exe=/opt/compiler-explorer/r8-8.5.35/r8-8.5.35.jar
5175

@@ -70,7 +94,7 @@ compiler.kotlin-r8-8242.exe=/opt/compiler-explorer/r8-8.2.42/r8-8.2.42.jar
7094
compiler.kotlin-r8-8233.name=r8 8.2.33
7195
compiler.kotlin-r8-8233.exe=/opt/compiler-explorer/r8-8.2.33/r8-8.2.33.jar
7296

73-
group.dex2oat.compilers=kotlin-dex2oat-latest:kotlin-dex2oat-3310:kotlin-dex2oat-3411:kotlin-dex2oat-3413:kotlin-dex2oat-3414:kotlin-dex2oat-3415:kotlin-dex2oat-3416:kotlin-dex2oat-3417:kotlin-dex2oat-3418
97+
group.dex2oat.compilers=kotlin-dex2oat-latest:kotlin-dex2oat-3310:kotlin-dex2oat-3411:kotlin-dex2oat-3413:kotlin-dex2oat-3414:kotlin-dex2oat-3415:kotlin-dex2oat-3416:kotlin-dex2oat-3417:kotlin-dex2oat-3418:kotlin-dex2oat-3508:kotlin-dex2oat-3509:kotlin-dex2oat-3510:kotlin-dex2oat-3511
7498
group.dex2oat.groupName=ART
7599
group.dex2oat.compilerType=dex2oat
76100
group.dex2oat.isSemVer=true
@@ -84,6 +108,34 @@ compiler.kotlin-dex2oat-latest.d8Id=kotlin-d8-8535
84108
compiler.kotlin-dex2oat-latest.isNightly=true
85109
compiler.kotlin-dex2oat-latest.profmanPath=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/profman
86110

111+
compiler.kotlin-dex2oat-3511.name=ART dex2oat aml_art_351110180 (Nov 2024)
112+
compiler.kotlin-dex2oat-3511.artArtifactDir=/opt/compiler-explorer/dex2oat-35.11
113+
compiler.kotlin-dex2oat-3511.exe=/opt/compiler-explorer/dex2oat-35.11/x86_64/bin/dex2oat64
114+
compiler.kotlin-dex2oat-3511.objdumper=/opt/compiler-explorer/dex2oat-35.11/x86_64/bin/oatdump
115+
compiler.kotlin-dex2oat-3511.d8Id=kotlin-d8-8718
116+
compiler.kotlin-dex2oat-3511.profmanPath=/opt/compiler-explorer/dex2oat-35.11/x86_64/bin/profman
117+
118+
compiler.kotlin-dex2oat-3510.name=ART dex2oat aml_art_351011240 (Oct 2024)
119+
compiler.kotlin-dex2oat-3510.artArtifactDir=/opt/compiler-explorer/dex2oat-35.10
120+
compiler.kotlin-dex2oat-3510.exe=/opt/compiler-explorer/dex2oat-35.10/x86_64/bin/dex2oat64
121+
compiler.kotlin-dex2oat-3510.objdumper=/opt/compiler-explorer/dex2oat-35.10/x86_64/bin/oatdump
122+
compiler.kotlin-dex2oat-3510.d8Id=kotlin-d8-8718
123+
compiler.kotlin-dex2oat-3510.profmanPath=/opt/compiler-explorer/dex2oat-35.10/x86_64/bin/profman
124+
125+
compiler.kotlin-dex2oat-3509.name=ART dex2oat aml_art_350913340 (Sep 2024)
126+
compiler.kotlin-dex2oat-3509.artArtifactDir=/opt/compiler-explorer/dex2oat-35.9
127+
compiler.kotlin-dex2oat-3509.exe=/opt/compiler-explorer/dex2oat-35.9/x86_64/bin/dex2oat64
128+
compiler.kotlin-dex2oat-3509.objdumper=/opt/compiler-explorer/dex2oat-35.9/x86_64/bin/oatdump
129+
compiler.kotlin-dex2oat-3509.d8Id=kotlin-d8-8718
130+
compiler.kotlin-dex2oat-3509.profmanPath=/opt/compiler-explorer/dex2oat-35.9/x86_64/bin/profman
131+
132+
compiler.kotlin-dex2oat-3508.name=ART dex2oat aml_art_350820960 (Aug 2024)
133+
compiler.kotlin-dex2oat-3508.artArtifactDir=/opt/compiler-explorer/dex2oat-35.8
134+
compiler.kotlin-dex2oat-3508.exe=/opt/compiler-explorer/dex2oat-35.8/x86_64/bin/dex2oat64
135+
compiler.kotlin-dex2oat-3508.objdumper=/opt/compiler-explorer/dex2oat-35.8/x86_64/bin/oatdump
136+
compiler.kotlin-dex2oat-3508.d8Id=kotlin-d8-8718
137+
compiler.kotlin-dex2oat-3508.profmanPath=/opt/compiler-explorer/dex2oat-35.8/x86_64/bin/profman
138+
87139
compiler.kotlin-dex2oat-3418.name=ART dex2oat aml_art_341810020 (Jun 2024)
88140
compiler.kotlin-dex2oat-3418.artArtifactDir=/opt/compiler-explorer/dex2oat-34.18
89141
compiler.kotlin-dex2oat-3418.exe=/opt/compiler-explorer/dex2oat-34.18/x86_64/bin/dex2oat64
@@ -306,9 +358,21 @@ libs.android-api-stubs.versions.11662386.version=11662386
306358
libs.android-api-stubs.versions.11662386.path=/opt/compiler-explorer/android-api-stubs-11662386/android.jar
307359

308360
libs.r8-keepanno.name=R8 keep-annotations
309-
libs.r8-keepanno.versions=8233:8242:8247:8336:8337:8510:8527:8535
361+
libs.r8-keepanno.versions=8233:8242:8247:8336:8337:8510:8527:8535:8617:8627:8714:8718
310362
libs.r8-keepanno.url=https://r8.googlesource.com/r8/+/refs/heads/main/doc/keepanno-guide.md
311363

364+
libs.r8-keepanno.versions.8718.version=8.7.18
365+
libs.r8-keepanno.versions.8718.path=/opt/compiler-explorer/r8-8.7.18-keepanno/keepanno-annotations.jar
366+
367+
libs.r8-keepanno.versions.8714.version=8.7.14
368+
libs.r8-keepanno.versions.8714.path=/opt/compiler-explorer/r8-8.7.14-keepanno/keepanno-annotations.jar
369+
370+
libs.r8-keepanno.versions.8627.version=8.6.27
371+
libs.r8-keepanno.versions.8627.path=/opt/compiler-explorer/r8-8.6.27-keepanno/keepanno-annotations.jar
372+
373+
libs.r8-keepanno.versions.8617.version=8.6.17
374+
libs.r8-keepanno.versions.8617.path=/opt/compiler-explorer/r8-8.6.17-keepanno/keepanno-annotations.jar
375+
312376
libs.r8-keepanno.versions.8535.version=8.5.35
313377
libs.r8-keepanno.versions.8535.path=/opt/compiler-explorer/r8-8.5.35-keepanno/keepanno-annotations.jar
314378

@@ -362,4 +426,4 @@ libs.androidx-annotation.versions.191.version=1.9.1
362426
libs.androidx-annotation.versions.191.path=/opt/compiler-explorer/androidx-annotation-1.9.1/annotation-jvm.jar
363427

364428

365-
defaultLibs=android-api-stubs.11662386:r8-keepanno.8535:androidx-annotation.versions.191
429+
defaultLibs=android-api-stubs.11662386:r8-keepanno.8718:androidx-annotation.versions.191

0 commit comments

Comments
 (0)