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

Commit 122374ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update Rust toolchain to 1.80.1, to match Android." into main

parents 1199a457 7862ca67
Loading
Loading
Loading
Loading
+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.