From c7d1d1659a025277b311eeb7440d7e00610688a0 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 10 Feb 2020 10:56:13 -0800 Subject: Update audio_streams checkout and dependencies Uprev the pinned commit and update Cargo.lock to match: - libcras no longer depends directly on sync - cras-sys now depends on audio_streams - audio_streams now depends on sync and sys_util BUG=None TEST=`cargo build` and verify Cargo.lock is unchanged TEST=docker/build_crosm_base.sh && docker/wrapped_smoke_test.sh Change-Id: Iba1fba57284e1e233725e4086d5d98bb460f118c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2047492 Reviewed-by: Stephen Barber Tested-by: Daniel Verkamp Commit-Queue: Dylan Reid --- Cargo.lock | 6 +++++- docker/checkout_commits.env | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 24cfb31..1aea075 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,6 +39,10 @@ version = "0.1.0" [[package]] name = "audio_streams" version = "0.1.0" +dependencies = [ + "sync 0.1.0", + "sys_util 0.1.0", +] [[package]] name = "bit_field" @@ -75,6 +79,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "cras-sys" version = "0.1.0" dependencies = [ + "audio_streams 0.1.0", "data_model 0.1.0", ] @@ -285,7 +290,6 @@ dependencies = [ "cras-sys 0.1.0", "data_model 0.1.0", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "sync 0.1.0", "sys_util 0.1.0", ] diff --git a/docker/checkout_commits.env b/docker/checkout_commits.env index 07cc2c7..92586bc 100644 --- a/docker/checkout_commits.env +++ b/docker/checkout_commits.env @@ -2,5 +2,5 @@ MESON_COMMIT=a1a8772034aef90e8d58230d8bcfce54ab27bf6a LIBEPOXY_COMMIT=af38a466caf9c2ae49b8acda4ff842ae44d57f78 TPM2_COMMIT=a9bc45bb7fafc65ea8a787894434d409f533b1f1 PLATFORM2_COMMIT=9239a43f2dc2e98e57e9d77aac72fa3ce8169e5f -ADHD_COMMIT=2440c2907c246bf400bf7816879b919966cdf9c6 +ADHD_COMMIT=d99fa2312e03594c1de236e7ac74b332b0ddc329 DRM_COMMIT=00320d7d68ddc7d815d073bb7c92d9a1f9bb8c31 -- cgit 1.4.1