[android] Add x86_64 build

.github/workflows/fnx.yaml

@@ -11,7 +11,7 @@ env:
   GODOT_BASE_BRANCH: 3.2
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 4096
-  ANDROID_NDK_VERSION: 21.1.6352462
+  ANDROID_NDK_VERSION: 23.2.8568313
 
 jobs:
   build:
@@ -20,13 +20,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-latest
+          - os: macos-13
             token: osx.editor
             build: scons -j2 platform=osx tools=yes target=release_debug verbose=yes
-          - os: macos-latest
+          - os: macos-13
             token: osx.editor.headless
             build: scons -j2 platform=server tools=yes target=release_debug verbose=yes
-          - os: macos-latest
+          - os: macos-13
             token: ios.release
             build: |
               mkdir iphone
@@ -44,9 +44,10 @@ jobs:
           - os: ubuntu-20.04
             token: android.template.debug
             build: |
-              scons platform=android -j 8 target=debug android_arch=arm64v8 tools=no module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no builtin_pcre2_with_jit=no
+              scons platform=android -j 8 target=debug android_arch=x86_64 tools=no module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no builtin_pcre2_with_jit=no builtin_libvpx=no module_webm_enabled=no optimize=none
+              scons platform=android -j 8 target=debug android_arch=arm64v8 tools=no module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no builtin_pcre2_with_jit=no builtin_libvpx=no module_webm_enabled=no optimize=none
               cd platform/android/java/
-              ./gradlew generateGodotTemplates
+              ./gradlew generateGodotTemplates --info
               # Remove files that will not be needed for export
               cd ../../..
               mv bin/android_source.zip bin/android_source.debug.zip
@@ -60,10 +61,10 @@ jobs:
           - os: ubuntu-20.04
             token: android.template.release
             build: |
-              scons platform=android -j 8 target=release_debug android_arch=armv7 tools=no module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no builtin_pcre2_with_jit=no
-              scons platform=android -j 8 target=release_debug android_arch=arm64v8 tools=no module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no builtin_pcre2_with_jit=no
+              scons platform=android -j 8 target=release_debug android_arch=x86_64 tools=no module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no builtin_pcre2_with_jit=no builtin_libvpx=no module_webm_enabled=no optimize=none
+              scons platform=android -j 8 target=release_debug android_arch=arm64v8 tools=no module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no builtin_pcre2_with_jit=no builtin_libvpx=no module_webm_enabled=no optimize=none
               cd platform/android/java/
-              ./gradlew generateGodotTemplates
+              ./gradlew generateGodotTemplates --info
               # Remove files that will not be needed for export
               cd ../../..
               mv bin/android_source.zip bin/android_source.release.zip
@@ -152,8 +153,8 @@ jobs:
             libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm
 
       - name: Compilation
-        env:
-          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
+        #env:
+        #  SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: ${{ matrix.build }}
 
       - name: Upload artifact
@@ -165,6 +166,7 @@ jobs:
   archive:
     runs-on: ubuntu-latest
     needs: [build]
+    permissions: write-all
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v2

SConstruct

@@ -60,6 +60,8 @@ if os.name == "nt" and (platform_arg == "android" or methods.get_cmdline_bool("u
 elif platform_arg == "javascript":
     # Use generic POSIX build toolchain for Emscripten.
     custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
+if platform_arg == "android":
+    custom_tools = ["clang", "clang++", "as", "ar", "link"]
 
 # We let SCons build its default ENV as it includes OS-specific things which we don't
 # want to have to pull in manually.