diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh index 1c9dc6b2443..dedfe087ab8 100755 --- a/.gitlab-ci/container/build-skqp.sh +++ b/.gitlab-ci/container/build-skqp.sh @@ -12,11 +12,17 @@ set -uex SKQP_BRANCH=android-cts-12.1_r5 -# hack for skqp see the clang -pushd /usr/bin/ -ln -s ../lib/llvm-15/bin/clang clang -ln -s ../lib/llvm-15/bin/clang++ clang++ -popd +SCRIPT_DIR=$(realpath "$(dirname "$0")") +SKQP_PATCH_DIR="${SCRIPT_DIR}/patches" +BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn" + +SKQP_ARCH=${SKQP_ARCH:-x64} +SKIA_DIR=${SKIA_DIR:-$(mktemp -d)} +SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH} +SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp} +SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets" +SKQP_BINARIES=(skqp list_gpu_unit_tests list_gms) + create_gn_args() { # gn can be configured to cross-compile skia and its tools @@ -40,17 +46,6 @@ download_skia_source() { git clone --branch "${SKQP_BRANCH}" --depth 1 "${SKQP_REPO}" "${SKIA_DIR}" } -SCRIPT_DIR=$(realpath "$(dirname "$0")") -SKQP_PATCH_DIR="${SCRIPT_DIR}/patches" -BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn" - -SKQP_ARCH=${SKQP_ARCH:-x64} -SKIA_DIR=${SKIA_DIR:-$(mktemp -d)} -SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH} -SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp} -SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets" -SKQP_BINARIES=(skqp list_gpu_unit_tests list_gms) - download_skia_source pushd "${SKIA_DIR}" @@ -59,6 +54,12 @@ pushd "${SKIA_DIR}" cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch | patch -p1 +# hack for skqp see the clang +pushd /usr/bin/ +ln -s ../lib/llvm-15/bin/clang clang +ln -s ../lib/llvm-15/bin/clang++ clang++ +popd + # Fetch some needed build tools needed to build skia/skqp. # Basically, it clones repositories with commits SHAs from ${SKIA_DIR}/DEPS # directory.