diff options
| author | Frederick Mayle <fmayle@google.com> | 2024-04-12 15:36:54 -0700 |
|---|---|---|
| committer | Frederick Mayle <fmayle@google.com> | 2024-04-15 13:00:06 -0700 |
| commit | c223989d8457ecb2345a8d2831d8a1e599abcb0c (patch) | |
| tree | 682de9eb6a3f88e0d15f30445ba3e0ec296edf6c /android-merge-2-cargo-embargo.sh | |
| parent | 3eba8661914b15dc34bde33d6a8201cfc76c7675 (diff) | |
| parent | b0967c6b2e6e17d23a50bb91c08c9bf712cffd00 (diff) | |
| download | crosvm-c223989d8457ecb2345a8d2831d8a1e599abcb0c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main'
Had to update the rust version to compile the new nix version.
The metrics protos have been deleted upstream, so those `out` files are
deleted (and we don't need to `sed` them in the script).
Added default_team for `hypervisor` to satisify a lint error, will add
it everywhere else later.
* aosp/upstream-main: (86 commits)
Roll recipe dependencies (trivial).
devices: vhost-user: fix test flake
Roll recipe dependencies (trivial).
Cargo.lock: switch to tokio 1.29.1
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
cros_async: Tokio IoSource for windows
cros_async: Add AsyncFd to Tokio linux implementation
cros_async: Blocking tokio executor for linux
devices: Fix nested executor invocation in async virtio-console
cros_async: Move `concurrency` to Overlapped enum
Roll recipe dependencies (trivial).
Create a minimal virtualization and hypervisor integration test.
gpu_display: add max_num_displays to GpuParameters.
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Refactor android display backend
e2e_tests: wait for restore to complete before sending commands
...
Bug: 332584046
Test: TH
Change-Id: I25dd0124d719a59c312ba31f060c1b37f1d2a1b6
Diffstat (limited to 'android-merge-2-cargo-embargo.sh')
| -rwxr-xr-x | android-merge-2-cargo-embargo.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/android-merge-2-cargo-embargo.sh b/android-merge-2-cargo-embargo.sh index f5f1759b3..ceaaa1ded 100755 --- a/android-merge-2-cargo-embargo.sh +++ b/android-merge-2-cargo-embargo.sh @@ -40,7 +40,7 @@ done # # TODO: Consider using android's prebuilt rust binaries. Currently doesn't work # because they try to incorrectly use system clang and llvm. -RUST_TOOLCHAIN="1.68.2" +RUST_TOOLCHAIN="1.73.0" rustup which --toolchain $RUST_TOOLCHAIN cargo || \ rustup toolchain install $RUST_TOOLCHAIN CARGO_BIN="$(dirname $(rustup which --toolchain $RUST_TOOLCHAIN cargo))" @@ -67,7 +67,3 @@ fi # cargo_embargo runs. This didn't happen with cargo2android.py because it # ignored the lock file. git restore Cargo.lock - -# Fix workstation specific path in "metrics" crate's generated files. -# TODO(b/232150148): Find a better solution for protobuf generated files. -sed --in-place 's/path = ".*\/out/path = "./' vendor/generic/metrics/src/out/generated.rs |