diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index a7b15028..71a2a117 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -109,29 +109,10 @@ jobs: with: version: 1.3.250.1 rt-dir: ${{ github.workspace }}/vulkanrt - - name: Build libclc - if: ${{ matrix.android-abi != '' }} - env: - LLVM_NATIVE_DIR: ${{ github.workspace }}/build_llvm_native/ - LLVM_ARCHIVE_PREFIX: LLVM-19.1.0-rc2-Linux-X64 - LIBCLC_DIR: ${{ github.workspace }}/build_libclc - run: | - set -x - wget https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0-rc2/${LLVM_ARCHIVE_PREFIX}.tar.xz - mkdir -p ${LLVM_NATIVE_DIR} - tar -xf ${LLVM_ARCHIVE_PREFIX}.tar.xz -C ${LLVM_NATIVE_DIR} - cmake -S '${{ github.workspace }}/external/clspv/third_party/llvm/libclc' -B ${LIBCLC_DIR} -G Ninja \ - -DLLVM_CMAKE_DIR=${LLVM_NATIVE_DIR}/${LLVM_ARCHIVE_PREFIX}/lib/cmake \ - -DCMAKE_CXX_COMPILER=${LLVM_NATIVE_DIR}/${LLVM_ARCHIVE_PREFIX}/bin/clang++ \ - -DCMAKE_CXX_FLAGS="-fuse-ld=lld" \ - -DLIBCLC_TARGETS_TO_BUILD="clspv--;clspv64--" - cmake --build ${LIBCLC_DIR} - ls -l ${LIBCLC_DIR} - rm -rf ${LLVM_NATIVE_DIR} ${LLVM_ARCHIVE_PREFIX}.tar.xz - name: Prepare Android CMake arguments if: ${{ matrix.android-abi != '' }} run: | - echo "android-cmake-args=-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/ndk/android-ndk-r25c/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.android-abi }} -DVulkan_LIBRARY=${{ github.workspace }}/ndk/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/33/libvulkan.so -DCLSPV_EXTERNAL_LIBCLC_DIR=${{ github.workspace }}/build_libclc" >> $GITHUB_ENV + echo "android-cmake-args=-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/ndk/android-ndk-r25c/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.android-abi }} -DVulkan_LIBRARY=${{ github.workspace }}/ndk/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/33/libvulkan.so" >> $GITHUB_ENV - name: Build Perfetto if: ${{ matrix.perfetto }} shell: bash