[andoid] enable intel 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:
@@ -44,7 +44,7 @@ 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
               cd platform/android/java/
               ./gradlew generateGodotTemplates
               # Remove files that will not be needed for export
@@ -60,8 +60,7 @@ 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
               cd platform/android/java/
               ./gradlew generateGodotTemplates
               # Remove files that will not be needed for export
@@ -79,7 +78,11 @@ jobs:
             build: |
               scons target=release_debug platform=server tools=yes module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no module_mono_enabled=no mono_glue=no
               ls -l bin/
-
+          - os: ubuntu-20.04
+            token: linux.editor
+            build: |
+              scons target=release_debug platform=x11 tools=yes module_firebase_enabled=no module_bullet_enabled=no module_websocket_enabled=no game_center=no module_mono_enabled=no mono_glue=no
+              ls -l bin/
 
 
 
@@ -133,7 +136,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           # Semantic version range syntax or exact version of a Python version
-          python-version: '3.10'
+          python-version: '3.11'
           # Optional - x64 or x86 architecture, defaults to x64
           architecture: 'x64'
 

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.