@@ -94,10 +94,13 @@ jobs:
9494 include :
9595 - target : aarch64-linux-android
9696 abi : arm64-v8a
97+ ndk_target : aarch64-linux-android
9798 - target : armv7-linux-androideabi
9899 abi : armeabi-v7a
100+ ndk_target : armv7a-linux-androideabi
99101 - target : x86_64-linux-android
100102 abi : x86_64
103+ ndk_target : x86_64-linux-android
101104 steps :
102105 - uses : actions/checkout@v4
103106
@@ -123,16 +126,17 @@ jobs:
123126 mkdir -p ~/.cargo
124127 cat >> ~/.cargo/config.toml << EOF
125128 [target.${{ matrix.target }}]
126- linker = "$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.target }}24-clang"
129+ linker = "$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.ndk_target }}24-clang"
127130 EOF
128131
129132 - name : Build
130133 run : |
131134 NDK_PATH="${{ steps.setup-ndk.outputs.ndk-path }}"
132135 # Set CC and AR for ring/rustls cross-compilation
133- # Convert target name to env var format (replace - with _)
136+ # Convert Rust target name to env var format (replace - with _)
134137 TARGET_ENV=$(echo "${{ matrix.target }}" | tr '-' '_')
135- export CC_${TARGET_ENV}="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.target }}24-clang"
138+ # Use NDK target name for the actual compiler (armv7a vs armv7)
139+ export CC_${TARGET_ENV}="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.ndk_target }}24-clang"
136140 export AR_${TARGET_ENV}="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
137141 cargo build -p fula-flutter --target ${{ matrix.target }} --release
138142
0 commit comments