Merge branch 'main' into video_layout

servo · Mar 20, 2024 · ce73e88 · ce73e88
2 parents c5f2ab5 + 15bf32a
commit ce73e88
Show file tree

Hide file tree

Showing 369 changed files with 106,324 additions and 38,916 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        arch: ['armv7-linux-androideabi', 'i686-linux-android']
+        arch: ['armv7-linux-androideabi', 'i686-linux-android', 'x86_64-linux-android']
     steps:
       - uses: actions/checkout@v4
         if: github.event_name != 'issue_comment' && github.event_name != 'pull_request_target'