Add support for building the x86_64 arch on android platform. (#1962)

* Add support for building the x86_64 arch on android platform.

* Fix the android demo on the build workflow.

* Add the missing x86_64 arch of libffavc.so

.github/workflows/build.yml

@@ -84,7 +84,7 @@ jobs:
           path: ios
 
   android:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Check Out Repo
         uses: actions/checkout@v3
@@ -105,6 +105,8 @@ jobs:
           npm install depsync -g
           depsync
 
+      - uses: seanmiddleditch/gha-setup-ninja@master
+
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
@@ -120,7 +122,7 @@ jobs:
 
       - name: Build Android
         run: |
-          New-Item -ItemType Directory -Force -Path third_party/tgfx/out/cache
+          mkdir -p third_party/tgfx/out/cache
           cd android
           ./gradlew assembleRelease -Parm64-only --no-daemon
 

DEPS

@@ -7,12 +7,12 @@
     "common": [
       {
         "url": "${PAG_GROUP}/vendor_tools.git",
-        "commit": "b5be62533c1c65f83c1b439713eb954ef3f6e2e4",
+        "commit": "628ca1bfc801ec22714faeb0c7b9ceada4efe121",
         "dir": "third_party/vendor_tools"
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "1a608730859e8943dd50d780191b8ae208f24e4f",
+        "commit": "db29a2b93408f6ce3acee469f38cb5651bcee274",
         "dir": "third_party/tgfx"
       },
       {

README.md

@@ -191,7 +191,7 @@ versions, you can download the precompiled libraries from [here](https://github.
 - Ninja 1.9.0+
 - CMake 3.13.0+
 - QT 5.13.0+
-- NDK 19+ (**19.2.5345600 recommended**)
+- NDK 19.2+ (**19.2.5345600 recommended**)
 - Emscripten 3.1.20+ (**3.1.20 recommended**)
 
 ### Dependency Management

README.zh_CN.md

@@ -181,7 +181,7 @@ Web 端更多接入方式请参考：[Web端接入指南](https://pag.art/docs/s
 - Ninja 1.9.0+
 - CMake 3.13.0+
 - QT 5.13.0+
-- NDK 19+ (**推荐 19.2.5345600 版本**)
+- NDK 19.2+ (**推荐 19.2.5345600 版本**)
 - Emscripten 3.1.20+ (**推荐 3.1.20 版本**)
 
 ### 依赖管理

android/app/build.gradle

@@ -17,6 +17,7 @@ android {
             } else {
                 abiFilters.add("armeabi-v7a")
                 abiFilters.add("arm64-v8a")
+                abiFilters.add("x86_64")
             }
         }
     }

android/libpag/build.gradle

@@ -29,6 +29,7 @@ android {
             } else {
                 abiFilters.add("armeabi-v7a")
                 abiFilters.add("arm64-v8a")
+                abiFilters.add("x86_64")
             }
         }
     }