diff options
| author | Jason Macnak <natsu@google.com> | 2021-07-07 11:59:07 -0700 |
|---|---|---|
| committer | Jason Macnak <natsu@google.com> | 2021-07-07 12:18:01 -0700 |
| commit | b5d1bc4e9fdace419ab7f44ecb5d39d4734d38fc (patch) | |
| tree | ab6d822e4a25b5629b337f31636aff7323b62211 /usb_util | |
| parent | a31e15c1e5707faa9735403a649d8dd36249c209 (diff) | |
| parent | eff60328c12262a93aeaff55ab1af4d81e7c6e79 (diff) | |
| download | crosvm-b5d1bc4e9fdace419ab7f44ecb5d39d4734d38fc.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'
... and update Android.bp to update Crosvm for Cuttlefish to pull
in multi-display virtio gpu support.
Bug: b/189933900
Test: launch_cvd
Test: launch_cvd --gpu_mode=gfxstream
Change-Id: I8af7120a22ebd35739805333536f95b94c4795f7
Diffstat (limited to 'usb_util')
| -rw-r--r-- | usb_util/Android.bp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usb_util/Android.bp b/usb_util/Android.bp index 6eafb7c20..250d7c2b7 100644 --- a/usb_util/Android.bp +++ b/usb_util/Android.bp @@ -81,10 +81,10 @@ rust_test { // futures-util-0.3.15 "alloc,futures-sink,sink" // intrusive-collections-0.9.1 "alloc,default" // itoa-0.4.7 -// libc-0.2.95 "default,std" +// libc-0.2.97 "default,std" // memoffset-0.5.6 "default" // paste-1.0.5 -// pin-project-lite-0.2.6 +// pin-project-lite-0.2.7 // pin-utils-0.1.0 // proc-macro2-1.0.27 "default,proc-macro" // quote-1.0.9 "default,proc-macro" @@ -95,7 +95,7 @@ rust_test { // serde_json-1.0.64 "default,std" // slab-0.4.3 "default,std" // smallvec-1.6.1 -// syn-1.0.72 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" +// syn-1.0.73 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" // thiserror-1.0.25 // thiserror-impl-1.0.25 // unicode-xid-0.2.2 "default" |