File tree Expand file tree Collapse file tree 2 files changed +11
-19
lines changed Expand file tree Collapse file tree 2 files changed +11
-19
lines changed Original file line number Diff line number Diff line change @@ -70,18 +70,18 @@ jobs:
7070 id : cache_ndk
7171 uses : actions/cache@v3
7272 with :
73- path : /tmp/android-ndk-r21e
74- key : android-ndk-${{ matrix.os }}-r21e
73+ path : /tmp/android-ndk-r23c
74+ key : android-ndk-${{ matrix.os }}-r23c
7575
7676 - name : Check cached NDK
7777 shell : bash
7878 if : steps.cache_ndk.outputs.cache-hit != 'true'
7979 run : |
8080 # If the NDK failed to download from the cache, but there is a
81- # /tmp/android-ndk-r21e directory, it's incomplete, so remove it.
82- if [[ -d "/tmp/android-ndk-r21e " ]]; then
81+ # /tmp/android-ndk-r23c directory, it's incomplete, so remove it.
82+ if [[ -d "/tmp/android-ndk-r23c " ]]; then
8383 echo "Removing incomplete download of NDK"
84- rm -rf /tmp/android-ndk-r21e
84+ rm -rf /tmp/android-ndk-r23c
8585 fi
8686
8787 - name : Install prerequisites
9292 python scripts/gha/install_prereqs_desktop.py
9393 build_scripts/android/install_prereqs.sh
9494 cd ..
95- echo "NDK_ROOT=/tmp/android-ndk-r21e " >> $GITHUB_ENV
96- echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e " >> $GITHUB_ENV
95+ echo "NDK_ROOT=/tmp/android-ndk-r23c " >> $GITHUB_ENV
96+ echo "ANDROID_NDK_HOME=/tmp/android-ndk-r23c " >> $GITHUB_ENV
9797 brew install swig
9898
9999 - name : Force Java 11
Original file line number Diff line number Diff line change @@ -499,20 +499,12 @@ def patch_android_env(unity_version):
499499 # Set ndk env
500500 UNITY_SETTINGS = {
501501 "2022" : {
502- _WINDOWS : "https://dl.google.com/android/repository/android-ndk-r21 -windows-x86_64 .zip" ,
503- _MACOS : "https://dl.google.com/android/repository/android-ndk-r21 -darwin-x86_64 .zip" ,
502+ _WINDOWS : "https://dl.google.com/android/repository/android-ndk-r23c -windows.zip" ,
503+ _MACOS : "https://dl.google.com/android/repository/android-ndk-r23c -darwin.zip" ,
504504 },
505505 "2021" : {
506- _WINDOWS : "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" ,
507- _MACOS : "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip" ,
508- },
509- "2020" : {
510- _WINDOWS : "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" ,
511- _MACOS : "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" ,
512- },
513- "2019" : {
514- _WINDOWS : "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" ,
515- _MACOS : "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" ,
506+ _WINDOWS : "https://dl.google.com/android/repository/android-ndk-r23c-windows.zip" ,
507+ _MACOS : "https://dl.google.com/android/repository/android-ndk-r23c-darwin.zip" ,
516508 },
517509 }
518510 url = UNITY_SETTINGS [str (major_version )][get_desktop_platform ()]
You can’t perform that action at this time.
0 commit comments