Skip to content

Commit ade4930

Browse files
committed
build
1 parent 14d5596 commit ade4930

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

.github/workflows/flutter-ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ jobs:
132132
targets: aarch64-linux-android
133133

134134
- name: Setup Android NDK
135+
id: setup-ndk
135136
uses: nttld/setup-ndk@v1
136137
with:
137138
ndk-version: r25c
@@ -141,12 +142,14 @@ jobs:
141142

142143
- name: Configure Cargo for Android
143144
run: |
145+
NDK_PATH="${{ steps.setup-ndk.outputs.ndk-path }}"
144146
echo "[target.aarch64-linux-android]" >> ~/.cargo/config.toml
145-
echo "linker = \"$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang\"" >> ~/.cargo/config.toml
147+
echo "linker = \"$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang\"" >> ~/.cargo/config.toml
146148
147149
- name: Build for Android (arm64)
148150
run: |
151+
NDK_PATH="${{ steps.setup-ndk.outputs.ndk-path }}"
149152
# Set CC and AR for ring/rustls cross-compilation
150-
export CC_aarch64_linux_android="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
151-
export AR_aarch64_linux_android="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
153+
export CC_aarch64_linux_android="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
154+
export AR_aarch64_linux_android="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
152155
cargo build -p fula-flutter --target aarch64-linux-android --release

.github/workflows/flutter-release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ jobs:
107107
targets: ${{ matrix.target }}
108108

109109
- name: Setup Android NDK
110+
id: setup-ndk
110111
uses: nttld/setup-ndk@v1
111112
with:
112113
ndk-version: r25c
@@ -118,19 +119,21 @@ jobs:
118119

119120
- name: Configure Cargo for Android
120121
run: |
122+
NDK_PATH="${{ steps.setup-ndk.outputs.ndk-path }}"
121123
mkdir -p ~/.cargo
122124
cat >> ~/.cargo/config.toml << EOF
123125
[target.${{ matrix.target }}]
124-
linker = "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.target }}24-clang"
126+
linker = "$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.target }}24-clang"
125127
EOF
126128
127129
- name: Build
128130
run: |
131+
NDK_PATH="${{ steps.setup-ndk.outputs.ndk-path }}"
129132
# Set CC and AR for ring/rustls cross-compilation
130133
# Convert target name to env var format (replace - with _)
131134
TARGET_ENV=$(echo "${{ matrix.target }}" | tr '-' '_')
132-
export CC_${TARGET_ENV}="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.target }}24-clang"
133-
export AR_${TARGET_ENV}="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
135+
export CC_${TARGET_ENV}="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/${{ matrix.target }}24-clang"
136+
export AR_${TARGET_ENV}="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
134137
cargo build -p fula-flutter --target ${{ matrix.target }} --release
135138
136139
- name: Upload artifact

0 commit comments

Comments
 (0)