@@ -1326,11 +1326,13 @@ jobs:
13261326 local-cache : true
13271327
13281328 - uses : actions/setup-python@v5
1329+ if : matrix.os != 'Android' || inputs.build_android
13291330 with :
13301331 python-version : ${{ inputs.python_version }}
13311332 architecture : x64 # FIXME(#1004): Remove workaround installing x64 Python on ARM64 CI hosts
13321333
1333- - name : Get lit version
1334+ - name : Get LLVM version
1335+ if : matrix.os != 'Android' || inputs.build_android
13341336 id : get-llvm-version
13351337 run : |
13361338 $litOutput = python ${{ github.workspace }}/SourceCache/llvm-project/llvm/utils/lit/lit.py --version
@@ -1365,6 +1367,7 @@ jobs:
13651367 }
13661368
13671369 - name : Configure ClangBuiltins
1370+ if : matrix.os != 'Android' || inputs.build_android
13681371 uses : ./SourceCache/ci-build/.github/actions/configure-cmake-project
13691372 with :
13701373 project-name : ClangBuiltins
@@ -1389,11 +1392,14 @@ jobs:
13891392 'COMPILER_RT_DEFAULT_TARGET_ONLY' = "YES";
13901393 }
13911394 - name : Build ClangBuiltins
1395+ if : matrix.os != 'Android' || inputs.build_android
13921396 run : cmake --build ${{ github.workspace }}/BinaryCache/ClangBuiltins
13931397 - name : Install ClangBuiltins
1398+ if : matrix.os != 'Android' || inputs.build_android
13941399 run : cmake --build ${{ github.workspace }}/BinaryCache/ClangBuiltins --target install-compiler-rt
13951400
13961401 - name : Configure ClangRuntime
1402+ if : matrix.os != 'Android' || inputs.build_android
13971403 uses : ./SourceCache/ci-build/.github/actions/configure-cmake-project
13981404 with :
13991405 project-name : ClangRuntime
@@ -1425,8 +1431,10 @@ jobs:
14251431 'COMPILER_RT_BUILD_SANITIZERS' = "YES";
14261432 }
14271433 - name : Build ClangRuntime
1434+ if : matrix.os != 'Android' || inputs.build_android
14281435 run : cmake --build ${{ github.workspace }}/BinaryCache/ClangRuntime
14291436 - name : Install ClangRuntime
1437+ if : matrix.os != 'Android' || inputs.build_android
14301438 run : cmake --build ${{ github.workspace }}/BinaryCache/ClangRuntime --target install-compiler-rt
14311439
14321440 - uses : thebrowsercompany/gha-upload-tar-artifact@e18c33b1cd416d0d96a91dc6dce06219f98e4e27 # main
@@ -4285,7 +4293,7 @@ jobs:
42854293 # TODO: Build this on macOS or make an equivalent Mac-only job
42864294 if : inputs.build_os == 'Windows'
42874295 name : Package Tools
4288- needs : [compilers, macros, debugging_tools, devtools, stdlib, sdk, configure_signing]
4296+ needs : [compilers, compiler-rt, macros, debugging_tools, devtools, stdlib, sdk, configure_signing]
42894297 runs-on : ${{ inputs.default_build_runner }}
42904298
42914299 strategy :
@@ -4321,6 +4329,46 @@ jobs:
43214329 name : Windows-${{ matrix.arch }}-NoAsserts-compilers
43224330 path : ${{ github.workspace }}/BuildRoot/Library
43234331
4332+ - name : Download Compilers Runtime (Windows-amd64)
4333+ uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
4334+ with :
4335+ name : Windows-amd64-compiler-rt
4336+ path : ${{ github.workspace }}/BuildRoot/Library
4337+ - name : Download Compilers Runtime (Windows-arm64)
4338+ uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
4339+ with :
4340+ name : Windows-arm64-compiler-rt
4341+ path : ${{ github.workspace }}/BuildRoot/Library
4342+ - name : Download Compilers Runtime (Windows-x86)
4343+ uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
4344+ with :
4345+ name : Windows-x86-compiler-rt
4346+ path : ${{ github.workspace }}/BuildRoot/Library
4347+ - name : Download Compilers Runtime (Android-arm64)
4348+ if : inputs.build_android
4349+ uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
4350+ with :
4351+ name : Android-arm64-compiler-rt
4352+ path : ${{ github.workspace }}/BuildRoot/Library
4353+ - name : Download Compilers Runtime (Android-armv7)
4354+ if : inputs.build_android
4355+ uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
4356+ with :
4357+ name : Android-armv7-compiler-rt
4358+ path : ${{ github.workspace }}/BuildRoot/Library
4359+ - name : Download Compilers Runtime (Android-x86_64)
4360+ if : inputs.build_android
4361+ uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
4362+ with :
4363+ name : Android-x86_64-compiler-rt
4364+ path : ${{ github.workspace }}/BuildRoot/Library
4365+ - name : Download Compilers Runtime (Android-i686)
4366+ if : inputs.build_android
4367+ uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
4368+ with :
4369+ name : Android-i686-compiler-rt
4370+ path : ${{ github.workspace }}/BuildRoot/Library
4371+
43244372 - name : Download Developer Tools
43254373 uses : actions/download-artifact@v4
43264374 with :
0 commit comments