Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7862ca67 authored by Andrew Walbran's avatar Andrew Walbran Committed by Abhishek Pandit-Subedi
Browse files

Update Rust toolchain to 1.80.1, to match Android. 

Also fix incorrect usage of cargo install --git --rev.

Bug: 361370910
Test: atest libbt_common_inline_tests
Change-Id: Ifd836fc0b3d364cb66736ed49999466e5f8f5ce8
parent 8c507d6a

floss/build/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ RUN apt-get update && \ 
# Next install the Rust toolchain. Download the toolchain to the local folder

# using curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs

ADD rustup/rustup.sh /tmp

RUN /tmp/rustup.sh -y --default-toolchain 1.77.1

RUN /tmp/rustup.sh -y --default-toolchain 1.80.1



# Add .cargo/bin to $PATH

ENV PATH="/root/.cargo/bin:${PATH}"
@@ -72,7 +72,7 @@ RUN cargo install --locked \ 
    pdl-compiler@0.1.1 \

    grpcio-compiler@0.13.0 \

    cargo-bloat@0.12.1

RUN cargo install --git https://android.googlesource.com/platform/build#8f9ca807 aconfig

RUN cargo install --git https://android.googlesource.com/platform/build --rev 8f9ca807 aconfig



# Rename llvm packages. By default, they are named 11vm-ar-13, etc. which won't

# work properly with the build.