From 55aab4817afaddef9262328675b11995babca0da Mon Sep 17 00:00:00 2001 From: William Candillon Date: Sun, 25 May 2025 21:09:41 +0200 Subject: [PATCH 1/4] =?UTF-8?q?chore(=F0=9F=AA=A8):=20Fix=20Skia=20Graphit?= =?UTF-8?q?e=20Builder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-skia-graphite.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build-skia-graphite.yml b/.github/workflows/build-skia-graphite.yml index 39117b2ea9..04f74366db 100644 --- a/.github/workflows/build-skia-graphite.yml +++ b/.github/workflows/build-skia-graphite.yml @@ -24,6 +24,20 @@ jobs: download_skia: 'false' github_token: ${{ secrets.GITHUB_TOKEN }} + - name: Apply Dawn patch + run: | + DAWN_GNI_FILE="./externals/skia/build_overrides/dawn.gni" + if [ -f "$DAWN_GNI_FILE" ]; then + echo "Applying patch to dawn.gni..." + # Remove the specified lines from the end of the file + sed -i.bak '/# PartitionAlloc is an optional dependency:/,$d' "$DAWN_GNI_FILE" + echo "Patch applied successfully." + echo "Modified dawn.gni content:" + cat "$DAWN_GNI_FILE" + else + echo "Warning: dawn.gni file not found at $DAWN_GNI_FILE" + fi + - name: Build Skia with Graphite working-directory: ./packages/skia env: From c64d4bba7500a20145ddd079deb2d671d6072240 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Sun, 25 May 2025 22:08:24 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=E2=AC=86=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-skia-graphite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-skia-graphite.yml b/.github/workflows/build-skia-graphite.yml index 04f74366db..dc2c8a07d5 100644 --- a/.github/workflows/build-skia-graphite.yml +++ b/.github/workflows/build-skia-graphite.yml @@ -13,7 +13,7 @@ jobs: id: setup-ndk uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0 with: - ndk-version: r22b + ndk-version: r25c - name: Setup Ninja uses: seanmiddleditch/gha-setup-ninja@master From 285aec8d82f6c24007348bc766901c42aa12464a Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 26 May 2025 03:32:02 +0200 Subject: [PATCH 3/4] Update build-skia-graphite.yml --- .github/workflows/build-skia-graphite.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-skia-graphite.yml b/.github/workflows/build-skia-graphite.yml index dc2c8a07d5..27f96cb26b 100644 --- a/.github/workflows/build-skia-graphite.yml +++ b/.github/workflows/build-skia-graphite.yml @@ -11,9 +11,12 @@ jobs: - name: Setup Android NDK id: setup-ndk - uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0 + uses: nttld/setup-ndk@v1 with: - ndk-version: r25c + ndk-version: r26d + + - name: Set ANDROID_NDK + run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV - name: Setup Ninja uses: seanmiddleditch/gha-setup-ninja@master From db45a825c7d98fea3a28606184a4481c71d0ec53 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 26 May 2025 03:35:17 +0200 Subject: [PATCH 4/4] Update build-skia-graphite.yml --- .github/workflows/build-skia-graphite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-skia-graphite.yml b/.github/workflows/build-skia-graphite.yml index 27f96cb26b..87af8a5fc2 100644 --- a/.github/workflows/build-skia-graphite.yml +++ b/.github/workflows/build-skia-graphite.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Android NDK id: setup-ndk - uses: nttld/setup-ndk@v1 + uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0 with: ndk-version: r26d