diff options
| author | 2024-09-04 14:01:10 +0100 | |
|---|---|---|
| committer | 2024-09-05 10:59:00 -0700 | |
| commit | 7862ca675e465ef5ec36335d26bc3734579521c1 (patch) | |
| tree | 119de42bddc98de948dded3acd06b6e0c4596d8c /floss | |
| parent | 8c507d6a5ca55438cea8b956ca45091ddd994390 (diff) | |
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
Diffstat (limited to 'floss')
| -rw-r--r-- | floss/build/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/floss/build/Dockerfile b/floss/build/Dockerfile index 23ec4cbc07..dc46ea94a2 100644 --- a/floss/build/Dockerfile +++ b/floss/build/Dockerfile @@ -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. |