Skip to content

Commit 4d68fc4

Browse files
fixed
1 parent 1c93f9c commit 4d68fc4

3 files changed

Lines changed: 24 additions & 47 deletions

File tree

‎.cargo/config.toml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
# .cargo/config.toml
2-
31
[target.armeabi-linux-androideabi]
42
linker="/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armeabi-linux-androideabi24-clang++"
3+
4+
# Android ARMv7
5+
[target.armv7-linux-androideabi]
6+
ar = "llvm-ar"
7+
linker = "armv7a-linux-androideabi-clang"
8+
9+
# Android ARM64
10+
[target.aarch64-linux-android]
11+
ar = "llvm-ar"
12+
linker = "aarch64-linux-android-clang"
13+
14+
# Android x86
15+
[target.i686-linux-android]
16+
ar = "llvm-ar"
17+
linker = "i686-linux-android-clang"
18+
19+
# Android x86_64
20+
[target.x86_64-linux-android]
21+
ar = "llvm-ar"
22+
linker = "x86_64-linux-android-clang"

‎.github/workflows/android.yml‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -73,50 +73,6 @@ jobs:
7373
7474
echo "$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" >> "$GITHUB_PATH"
7575
76-
# ------------------------------------------------------
77-
# Configure Cargo linker
78-
# ------------------------------------------------------
79-
80-
- name: Configure Cargo
81-
shell: bash
82-
run: |
83-
mkdir -p ~/.cargo
84-
85-
NDK="$ANDROID_HOME/ndk/27.2.12479018"
86-
TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin"
87-
88-
case "${{ matrix.target }}" in
89-
90-
aarch64-linux-android)
91-
LINKER="$TOOLCHAIN/aarch64-linux-android24-clang"
92-
;;
93-
94-
armv7-linux-androideabi)
95-
LINKER="$TOOLCHAIN/armv7a-linux-androideabi24-clang"
96-
;;
97-
98-
x86_64-linux-android)
99-
LINKER="$TOOLCHAIN/x86_64-linux-android24-clang"
100-
;;
101-
102-
i686-linux-android)
103-
LINKER="$TOOLCHAIN/i686-linux-android24-clang"
104-
;;
105-
106-
*)
107-
echo "Unsupported target"
108-
exit 1
109-
;;
110-
esac
111-
112-
cat > ~/.cargo/config.toml <<EOF
113-
[target.${{ matrix.target }}]
114-
linker = "$LINKER"
115-
EOF
116-
117-
echo "Using linker:"
118-
cat ~/.cargo/config.toml
119-
12076
# ------------------------------------------------------
12177
# Build
12278
# ------------------------------------------------------

‎Cargo.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[package]
2-
name = "armv7-android"
2+
name = "android-rust-app"
33
version = "0.1.0"
44
edition = "2021"
5+
authors = ["Sushil Kumar"]
6+
description = "Rust Android multi-architecture example"
7+
license = "Apache 2.0"
58

69
[dependencies]
710

0 commit comments

Comments
 (0)