diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3384d071..a1f0d6ae 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -21,8 +21,8 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.73.0, nightly-2023-10-05 - target: aarch64-linux-android + # toolchain: 1.73.0, nightly-2023-10-05 + # target: aarch64-linux-android rustflags: "" cache-directories: "/home/runner/.cargo/bin C:\\Users\\runneradmin\\.cargo\\bin" diff --git a/Makefile.toml b/Makefile.toml index 40a3ffb5..08a7ee00 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -83,4 +83,9 @@ args = ["build", "--release", "--package", "magenboy_libretro"] install_crate = {crate_name = "cargo-ndk", binary = "cargo", test_arg = "ndk"} install_crate_args=["--locked", "--version", "3.5.4"] command = "cargo" -args = ["ndk", "--target=aarch64-linux-android", "build", "--release", "--package", "magenboy_libretro"] \ No newline at end of file +args = ["ndk", "--target=aarch64-linux-android", "build", "--release", "--package", "magenboy_libretro"] +dependencies = ["add_android_target"] + +[tasks.add_android_target] +command = "rustup" +args = ["target", "install", "aarch64-linux-android"] \ No newline at end of file diff --git a/rust-toolchain.toml b/rust-toolchain.toml index ee256d8b..0a6364cd 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,4 @@ [toolchain] channel = "1.73.0" components = [ "rust-src" ] -profile = "minimal" -targets = ["aarch64-linux-android", "armv7a-none-eabihf"] \ No newline at end of file +profile = "minimal" \ No newline at end of file