diff options
| author | Andrew Walbran <qwandor@google.com> | 2022-01-28 16:27:57 +0000 |
|---|---|---|
| committer | Andrew Walbran <qwandor@google.com> | 2022-01-28 17:33:22 +0000 |
| commit | 2360f1e08a15b302cc058f8956062d0451284f1f (patch) | |
| tree | b3d525bce9c07c77846b3e86598225a1763fb453 /libcras_stub | |
| parent | 35796168532cd2c727ed1b0d874ad94d2012716d (diff) | |
| parent | e79aba10265f79c05ee92f1ff59f23016fbcaa41 (diff) | |
| download | crosvm-2360f1e08a15b302cc058f8956062d0451284f1f.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into master.
Bug: 211704107
Bug: 215517095
Change-Id: I8a4fb850353725c2431e217c91106085d44a6e6e
Diffstat (limited to 'libcras_stub')
| -rw-r--r-- | libcras_stub/.windows_build_test_skip | 0 | ||||
| -rw-r--r-- | libcras_stub/README.md | 11 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libcras_stub/.windows_build_test_skip b/libcras_stub/.windows_build_test_skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/libcras_stub/.windows_build_test_skip diff --git a/libcras_stub/README.md b/libcras_stub/README.md index bdd5e7424..8dfbfec52 100644 --- a/libcras_stub/README.md +++ b/libcras_stub/README.md @@ -2,11 +2,10 @@ libcras is used by ChromeOS to play audio through the cras server. -In ChromeOS builds, the `audio_cras` cargo feature is enabled and this crate is -replaced with the actual [libcras] implementation. +In ChromeOS builds, the `audio_cras` cargo feature is enabled and this crate is replaced with the +actual [libcras] implementation. -On other platforms, the feature flag will remain disabled and this crate is used -to satisfy cargo dependencies on libcras. +On other platforms, the feature flag will remain disabled and this crate is used to satisfy cargo +dependencies on libcras. -[libcras]: - https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/third_party/adhd/cras/client/libcras/ +[libcras]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/third_party/adhd/cras/client/libcras/ |