Skip to content

Commit eddef16

Browse files
committed
升级ndk到r27d
1 parent ef4dcab commit eddef16

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/composites/unity-build-plugins/android/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
npm i
3232
cd ${{ inputs.build_proj_dir }}
3333
cd ${{ inputs.backend }}
34-
ANDROID_NDK=~/android-ndk-r23c node ../../cli make --platform android --config ${{ inputs.config }} --websocket ${{ inputs.websocket }}
34+
ANDROID_NDK=~/android-ndk-r27d node ../../cli make --platform android --config ${{ inputs.config }} --websocket ${{ inputs.websocket }}
3535
cd ..
3636
- name: Upload
3737
uses: actions/upload-artifact@v4

.github/workflows/unity_build_plugins.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
shell: bash
4949
run: |
5050
cd ~
51-
rm -rf ~/android-ndk-r23c
52-
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r23c-linux.zip
51+
rm -rf ~/android-ndk-r27d
52+
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r27d-linux.zip
5353
sudo apt install unzip -y
5454
unzip -q NDK
5555
- name: puerts

.github/workflows/unity_build_plugins_custom.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
shell: bash
2727
run: |
2828
cd ~
29-
rm -rf ~/android-ndk-r23c
30-
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r23c-linux.zip
29+
rm -rf ~/android-ndk-r27d
30+
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r27d-linux.zip
3131
sudo apt install unzip -y
3232
unzip -q NDK
3333
- name: BuildAndroid

.github/workflows/unity_publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
shell: bash
2020
run: |
2121
cd ~
22-
rm -rf ~/android-ndk-r23c
23-
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r23c-linux.zip
22+
rm -rf ~/android-ndk-r27d
23+
wget -O NDK -q https://dl.google.com/android/repository/android-ndk-r27d-linux.zip
2424
sudo apt install unzip -y
2525
unzip -q NDK
2626
- name: puerts

unity/cli/make.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const platformCompileConfig = {
7676
'armv7': {
7777
outputPluginPath: 'Android/libs/armeabi-v7a/',
7878
hook: function (CMAKE_BUILD_PATH, options, cmakeAddedLibraryName, cmakeDArgs) {
79-
const NDK = process.env.ANDROID_NDK || process.env.ANDROID_NDK_HOME || '~/android-ndk-r23c';
79+
const NDK = process.env.ANDROID_NDK || process.env.ANDROID_NDK_HOME || '~/android-ndk-r27d';
8080
const API = ((options.backend.indexOf('node') !== -1) || (options.backend.indexOf('python') !== -1) || cmakeDArgs.indexOf('V8_118_OR_NEWER') !== -1) ? 'android-24' : (options.backend.indexOf('10.6.194') !== -1 ? 'android-23' : 'android-21');
8181
const ABI = 'armeabi-v7a';
8282
const TOOLCHAIN_NAME = 'arm-linux-androideabi-4.9';
@@ -103,7 +103,7 @@ const platformCompileConfig = {
103103
'arm64': {
104104
outputPluginPath: 'Android/libs/arm64-v8a/',
105105
hook: function (CMAKE_BUILD_PATH, options, cmakeAddedLibraryName, cmakeDArgs) {
106-
const NDK = process.env.ANDROID_NDK || process.env.ANDROID_NDK_HOME || '~/android-ndk-r21b';
106+
const NDK = process.env.ANDROID_NDK || process.env.ANDROID_NDK_HOME || '~/android-ndk-r27d';
107107
const API = ((options.backend.indexOf('node') !== -1) || (options.backend.indexOf('python') !== -1) || cmakeDArgs.indexOf('V8_118_OR_NEWER') !== -1) ? 'android-24' : (options.backend.indexOf('10.6.194') !== -1 ? 'android-23' : 'android-21');
108108
const ABI = 'arm64-v8a';
109109
const TOOLCHAIN_NAME = 'arm-linux-androideabi-clang';
@@ -130,7 +130,7 @@ const platformCompileConfig = {
130130
'x64': {
131131
outputPluginPath: 'Android/libs/x86_64/',
132132
hook: function (CMAKE_BUILD_PATH, options, cmakeAddedLibraryName, cmakeDArgs) {
133-
const NDK = process.env.ANDROID_NDK || process.env.ANDROID_NDK_HOME || '~/android-ndk-r21b';
133+
const NDK = process.env.ANDROID_NDK || process.env.ANDROID_NDK_HOME || '~/android-ndk-r27d';
134134
const API = ((options.backend.indexOf('node') !== -1) || (options.backend.indexOf('python') !== -1) || cmakeDArgs.indexOf('V8_118_OR_NEWER') !== -1) ? 'android-24' : (options.backend.indexOf('10.6.194') !== -1 ? 'android-23' : 'android-21');
135135
const ABI = 'x86_64';
136136
const TOOLCHAIN_NAME = 'x86_64-4.9';

0 commit comments

Comments
 (0)