* All non-crosvm users of crosvm_defaults are gone, so we don't need a
separate internal defaults module.
* Edition is set automatically by cargo_embargo.
* authfs only needs visibility on libfuse_rust, which is done via
cargo_embargo.
Bug: 269356487
Test: m
Change-Id: I3091e76e86435021bc3b1c5deb77a5b5d514ca32
https://r.android.com/3484205 changed the Android.bp files directly to
fix an issue with setting apex_available on test modules. This commit
refixes the issue in a different way that works better with
cargo_embargo.
Instead of setting apex_available via the rust_defaults, which is used
for every module type, we use cargo_embargo's apex_available config
option, which only applies to non-test modules.
Bug: 269356487
Test: m
Change-Id: Ib7a10e23342ead86553232a7014747b46ffefaf2
* aosp/upstream-main: (30 commits)
vm_memory: return the backing object from `Guest::offset_from_base`
vm_memory: track --file-backed-mapping RAM regions in GuestMemory
rutabaga_gfx: &str -> &Path for snapshot directory
rutabaga_gfx: snapshot/restore rutabaga core to directory
Roll recipe dependencies (trivial).
devices: virtio_gpu: Pack rutabaga snapshot directory
devices: virtio_gpu: move snapshot scratch into nested tempdir
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Standardize on `anyhow = "1"` in Cargo.toml files
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
[clippy] use div_ceil() and next_multiple_of()
kernel_loader: fix off-by-one in ELF address range end
aarch64: fix off-by-one errors in kernel end calculations
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
...
Bug: 392977518
Test: m
Change-Id: I0c9a490c3497cc29e1c2182d60eeb91a3aa35bdf
Soong was accidentally allowing a corner case where modules that
were not supposed to be available to the platform (due to
apex_available being set to an apex and not including
"//apex_available:platform") were being made available to the
platform as long as no apex modules depended on them. Split
crosvm_defaults into crosvm_defaults and crosvm_test_defaults,
where only crosvm_defaults gets apex_available: ["com.android.virt"],
and switch all the rust_test modules to use crosvm_test_defaults.
Bug: 394664568
Test: compare out/soong/installs-${TARGET_PRODUCT}.mk
Change-Id: I7ce4dabbcf1600cf44833b7883977e27a4ad7561
The address range returned by load_elf() was miscalculated due to the
different end address convention (inclusive versus exclusive). Replace
the AddressRange manual initialization with from_start_and_size() to
avoid confusion and fix the off-by-one mistake.
BUG=b:354116267
TEST=Verify DT kernel-size field matches expected value
Change-Id: Ideed730cb447a1ccc12287d0aa33e3439b374f3f
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/6235945
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
* aosp/upstream-main: (44 commits)
vm_control: snapshot: use DirEntry fields in list_fragments()
Roll recipe dependencies (trivial).
x86_64: update comment about pvmfw ABI
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Decouple cpu_ipc_ratio and cpu_capacity
Re-use existing parse function for BTreeMap<usize, u32>
vm_control: add snapshot parse error context.
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
jail: add fstat to jail_warden.policy to fix e2e hotplug tests
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
jail: let scsi make the same syscalls as block
bindgen-common: use ChromeOS kernel 6.12 headers
power_monitor: Only compile `protos` on the `powerd` feature
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
...
Bug: 388347911
Test: atest --test-mapping external/crosvm
Change-Id: Ibb0dc3ec503280a211e2b08d76265f435a94b524
Update the kernel version used to generate the bindings from Linux 6.6
to Linux 6.12, and remove the manual kvm_userspace_memory_region2
additions from kvm_sys/bindgen.sh.
The KVM_CAP_USER_CONFIGURE_NONCOHERENT_DMA capability index was changed
between ChromeOS v6.6 and v6.12, so a workaround to use the v6.6 value
is added; this maintains the existing behavior of querying cap index 236
on all kernels, which may return unexpected results on non-ChromeOS
kernels or ChromeOS v6.12 kernels.
BUG=b:388092267
TEST=tools/dev_container tools/presubmit
Change-Id: Icccc022005de37e12d552951eaadcf6c20ac914a
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/6150076
Reviewed-by: Ryan Neph <ryanneph@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
* aosp/upstream-main: (29 commits)
gpu_display/wayland: Add touch event for mouse
x86_64: factor out e820 map generation
Roll recipe dependencies (trivial).
x86_64: return type of kernel from load_kernel()
Roll recipe dependencies (trivial).
x86_64: read maximum command line size from kernel
kernel_cmdline: remove capacity from Cmdline
ext2: Use builder pattern for creating fs
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
devices: virtio_gpu: simplify remove_displays()
cmdline: simplify enable_fw_cfg with unwrap_or_default()
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
vmm_host: Make VhostUserStream blocking
Roll recipe dependencies (trivial).
disk: add option to disable file locking
Roll recipe dependencies (trivial).
vm_memory: improve MemoryNotAligned error message
Roll recipe dependencies (trivial).
...
Bug: 365593627
Test: atest --test-mapping external/crosvm
Change-Id: I043e945f4182611205a1b2c2c3f1f09775621af0
This is only used by the x86_64 arch code, and it isn't really related
to kernel loading. Moving it to x86_64 will also allow x86-specific
changes in upcoming CLs.
No functional change intended.
BUG=b:362168475
Change-Id: I4d01ba81d4f14fe73b38d62981a2c5a651b1bf03
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5842390
Reviewed-by: Junichi Uekawa <uekawa@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
* aosp/upstream-main: (23 commits)
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
devices: virtio: make Queue track its own Interrupt
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Update a few older VM tests to work with more functional HAXM
Added test to verify nonsupport of MONITOR and related instructions
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Add arcvm_gki_cq test plan
x86_64: move gdb support to a separate file
Let UnixSeqpacketListener convert into OwnedFd
hyp: Rename ProtectionType::loads_firmware()
seccomp: allow socketpair for ipcz
devices: virtio-console: consume self in WorkerHandle::stop()
devices: virtio-console: restore port outputs when stopping worker
devices: virtio-console: stop worker thread on reset
docs: update kumquat instructions
...
Bug: 360912609
Test: TH
Change-Id: I43caf84d1fccc3b28c5b2b4eb155fb6a631ddc5f
Create a new patch file for power_monitor
Fix rutabaga_gfx and disk Android.bp.patch files.
Test: m
Bug: 335312770
Change-Id: Ie08db8cabf55b38976be0343a8a41b7111a8d0f1
* aosp/upstream-main: (472 commits)
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
hypervisor: add test for AVX state.
ext2: Support so many directory entires that require multiple blocks
ext2: Ignore host-side lost+found
devices: virtio-blk: don't stop the worker thread on sleep/reset
device: fs: Implement FS_IOC_PATHXATTR ioctl
device: fs: Implement FS_IOC_SETPERMISSION ioctl
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
hypervisor: x86_64: add custom type for FPU regs
Roll recipe dependencies (trivial).
...
Test: launch_cvd and Treehugger
Bug: 335312770
Change-Id: I7b388bcb43fdd60177a5b76470bd3526698cd421
Ensure that every Cargo.toml dependency on a third-party crates.io crate
specifies at least a major version, or a minor version for 0.x crates,
to ensure that if a new major version is published, it cannot cause API
breaks.
The versions are selected to match the ones already in Cargo.lock, so
this should have no functional change, but it will help prevent new "*"
versions from being introduced via copy-and-paste.
For rationale, see the Cargo FAQ:
<https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies>
`minijail`, `audio_streams`, and `cras` are left as "*" for now, since
they have unusual situations (imported from a submodule and/or replaced
at build time with ebuild magic).
BUG=None
TEST=tools/dev_container tools/presubmit
TEST=verify Cargo.lock is unchanged
Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656
Reviewed-by: Frederick Mayle <fmayle@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
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
Rerun the tool to update the comments in the bp file. Also re-generate
the patch file for rutabaga_gfx. Below were what I did.
0. sync to ToT
1. delete rutabaga_gfx/patches/Android.bp.patch
2. stash rutabaga_gfx/Android.bp to somewhere else
3. run ./android-merge-2-cargo-embargo.sh (without the step 1)
4. create a temp commit
5. re-apply #2 and manually update the comment
6. git diff > rutabaga_gfx_patches/Android.bp.patch
7. amend the commit #4 with the changes in #5 and #6.
Bug: N/A
Test: N/A
Change-Id: Ieb9c8c6a811e9fd09b52910f504c454eaec9b80f
The arm64 kernel header contains an 'image_size' field indicating the
minimum size of the reserved memory region into which the kernel is
loaded. This is larger than the size of the Image file, as it also takes
into account NOBITS sections such as the .bss, which will be zeroed
during boot.
Although crosvm parses the kernel header, it fails to take 'image_size'
into account and can end up loading the initrd over the .bss if the
section is large enough to cross the next 16MiB alignment boundary after
the end of the Image.
Size the memory reservation according to the 'image_size' field in the
arm64 kernel Image header, warning if it's zero and falling back to the
current behaviour.
BUG=b:322966413
TEST=tools/dev_container tools/run_tests --platform=aarch64
Change-Id: I23316f201d8a7fd9025762be518aa505e716c642
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5249889
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Will Deacon <willdeacon@google.com>
Reviewed-by: Frederick Mayle <fmayle@google.com>
Kernel images are often stored compressed because they can take up a
significant amount of disk space. One of the popular formats for this is
LZ4. Even though it does not offer the best compression ratio, it excels
at decompression speeds.
On arm64, kernels do not come with their own decompressor like they do
on x86. Instead, it is the job of the bootloader to decompress the
kernel before it is executed.
To this end, add crosvm support for LZ4 decompression of kernel images,
via the Rust-safe lz4_flex library. LZ4 file format is detected
automatically via one of its magic numbers. Otherwise crosvm will fall
back to loading the kernel as a raw image.
Some rough numbers using Android's Generic Kernel Image on Pixel 8:
* compresion rate: 49% (33MB -> 16MB)
* decompression time: 20-30ms
Given that the total VM boot takes about 1.5s, the overhead is more than
acceptable.
BUG=b:315141974
TEST=tools/dev_container tools/run_tests --platform=aarch64
Change-Id: I1030abe6fdf7087603cea9ac5273bf9136bad693
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5110323
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: David Brazdil <dbrazdil@google.com>
* aosp/upstream-main: (39 commits)
devices: virtcpufreq: Add scaling factor to UClamp applied
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
seccomp: Add a policy for pvclock device
e2e_tests: Update use_local_build.sh to include the initrd env var
aarch64: fdt: Update compatible string for virt cpufreq
hypervisor: x86: Add MSR allowlist and restore MSRs 1 at a time
jail: seccomp: fix missing syscall for fs on arm
Roll recipe dependencies (trivial).
Clone host CPU capacity/clusters for --host-cpu-topology
Roll recipe dependencies (trivial).
swap: prevent guest memory in the main process munmap(2)ed
swap: do not panic if main process dies while swapping in
swap: do not panic on tube errors
Roll recipe dependencies (trivial).
devices: disable read-only memslots based on hypervisor
hypervisor: kvm: Fix xsave size when Xsave2 is not supported
jail: seccomp: add missing battery syscalls on non-x86
book: Use v6.6 termina kernel in custom_kernel_rootfs
linux_input_sys: simplify input event decoders
...
Bug: 319252379
Test: atest --test-mapping external/crosvm
Change-Id: I68e9777dfa707df75af64e1b66e2229bdd7b88a7
The obsolete KVM_SET_MEMORY_ALIAS ioctl was removed from the kernel; it
was already unused in crosvm, so remove the corresponding ioctl macro.
Change-Id: I1ecfce4b8df886680154c567f82ab7f006fbfd1f
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5178535
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
This removes some auto-generated safety comments, but should otherwise
be a no-op.
Change-Id: Ibfcf75c6e296367fe1a6114ce2047fb79e34041b
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5178534
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
IoBuf is defined in a platform-specific way (it is either iovec on unix
or WSABUF for windows), so it fits into the mission statement of the
base crate, which is meant to be *the* platform abstraction layer in
crosvm.
IoBufMut and VolatileMemory/VolatileSlice are defined in terms of IoBuf,
so they are also moved into base for consistency. Every crate that uses
these types already depended on base, so no extra dependencies are
added, and a few can be removed.
BUG=b:312312646
TEST=tools/dev_container tools/presubmit
Change-Id: I4dddc55d46906dfc55b88e8e6a967d7e1c1922dd
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5046605
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
These duplicate existing VolatileSlice and FileReadWriteAtVolatile
functionality. Removing them means that they don't need to be
reimplemented separately for each platform's MemoryMapping.
BUG=b:309020556
TEST=tools/dev_container tools/presubmit
Change-Id: Ia4332159461efc001b4e980fdb2a9984e852c931
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5019440
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Rather than using MaybeUninit to create a zeroed instance of a type and
std::slice::from_raw_parts_mut() to get a mutable &[u8] referring to it,
we can use the zerocopy 0.7 FromZeroes trait new_zeroed() function and
the AsBytes + FromBytes as_bytes_mut() function to read from the reader
into the type as a mutable &[u8].
This removes all of the unsafe code in the zerocopy_from_reader()
function.
BUG=None
TEST=tools/dev_container tools/presubmit
Change-Id: I76b12b69b02e807a3e52ac9b9e7e7165ee1f55f4
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4939612
Reviewed-by: Zihan Chen <zihanchen@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
In particular, this fixes the Clone impl for __BindgenUnionField, which
triggers clippy's incorrect_clone_impl_on_copy_type in Rust 1.73.
Additionally, --size_t-is-usize became the default and the option was
removed in bindgen 0.65.0, so the flag is dropped from our bindgen
command line.
BUG=None
TEST=tools/bindgen-all-the-things
Change-Id: I40a26cd4a9e2897af8a354f454f4909429d2feda
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4927831
Reviewed-by: Zihan Chen <zihanchen@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
zerocopy 0.7.x has finally released as a stable version, uprev it
to allow some remaining structs to be derivable.
TEST=CQ
BUG=b:300969352
FIXED=b:300969352
Change-Id: I90f0dfb09494f875fef1cd11bfcbd48030846092
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4878761
Auto-Submit: Zihan Chen <zihanchen@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Zihan Chen <zihanchen@google.com>
Previously all of the zerocopy imports just used "*", but there are
API changes in zerocopy 0.7, so ensure we get a compatible version by
depending on 0.6 everywhere.
This is a no-op since Cargo.lock already specifies a 0.6.x version, but
it will prevent accidentally upgrading to 0.7.x without updating to the
new API.
BUG=b:301283548
TEST=cargo build
Change-Id: Ifd702d982a09b5083dddd666dc6f3052cba22214
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4878502
Reviewed-by: Zihan Chen <zihanchen@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
* aosp/upstream-main: (57 commits)
data_model: Reland remove VolatileRef
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
kernel_loader: Use Linux UAPI header for bindings
devices: Add trace point for virtio-net
Roll recipe dependencies (trivial).
devices: usb: Implement Reset Endpoint command handler
devices: usb: Handle stall error
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
swap: add tests for UffdList
clippy fixes for Rust 1.69
swap: move UffdList into a single file
swap: add SwapDeviceHelper for forking grand-child processes
swap: garbage collect uffds for detached hot plug devices
devices: irqchip: fix compiler error on riscv64
data_model: windows: panic if IoBuf len is too large
Roll recipe dependencies (trivial).
...
Bug: 284966293
Test: atest # cf TEST_MAPPING
Change-Id: Icf621d83cf587189b0b2cab67ba343388755fb6b
We are down to only 30 `unsafe impl DataInit` across our repo now!
TEST=CQ
BUG=b:204409584
Change-Id: I1b6cf95b2a15eac194f3b464330009fd898a0bfa
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4356907
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Zihan Chen <zihanchen@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
* aosp/upstream-main: (40 commits)
Reland "docs: book: fix memory layout source links and line numbers"
Reland "x86_64: place setup_data immediately after cmdline"
cros_fdt: remove max_size from FdtWriter::finish()
Roll recipe dependencies (trivial).
devices: virtio: block: test resize and reset
Roll recipe dependencies (trivial).
gpu_display: find wayland-scanner with which in build.rs
Roll recipe dependencies (trivial).
devices: block: fix race condition causing panic on shutdown
tools: Do not use pip to install python packages
devices: use fork_process() from ProxyDevice::new()
infra: Use tools/run_tests instead of run_tests2 alias
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
e2e_tests: Restructure for initial benchmark support
bindgen: update kernel bindings to Linux 6.1
audio_streams: Implement Serialize and Deserialize for StreamEffect
devices: convert various devices to use WorkerThread
...
Bug: 270404912
Test: m && launch_cvd
Test: atest --test-mapping external/crosvm
Change-Id: I5114fe8b06fa53f82ea947d690459684254707cf
Switch to the ChromeOS v6.1 branch and regenerate all affected bindings
in the crosvm tree.
Some minor fixes were required in users of the bindings:
- KVM_SYSTEM_EVENT_RESET_FLAG_PSCI_RESET2 is available in the kernel now
and was removed from the manually-added section of kvm_sys.
- The KVM system_event now contains an anonymous union, requiring a few
renames.
- IORING_OP_* were moved into an enum, which required the enum name to
be prefixed to the uses of those values.
BUG=None
TEST=tools/presubmit --all
Change-Id: I84568fb76658832130e2e9a631495ba82fd4c3ed
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4285742
Reviewed-by: Elie Kheirallah <khei@google.com>
Reviewed-by: Zihan Chen <zihanchen@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Bug: 268061413
Test: TEST_MAPPING
* aosp/upstream-main:
Roll recipe dependencies (trivial).
swap: refine swap status response
base: fix mmap doc test on Windows.
Roll recipe dependencies (trivial).
tools: make scripts windows/downstream friendly
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
crosvm: unix: add bind_mounts to SandboxConfig
crosvm: unix: refactor the interface of jail_helpers
Roll recipe dependencies (trivial).
New nextest based test runner
Roll recipe dependencies (trivial).
base: Add custom_serde lib for custom serializers
Roll recipe dependencies (trivial).
Roll recipe dependencies (trivial).
devices: use base::error instead of eprintln
e2e_tests: suspend_resume: consume exec_command_async response
crosvm: Partially convert DataInit to zerocopy (1/n)
Roll recipe dependencies (trivial).
Change-Id: I6339fed9f53069fba52015987657c6c5167386a1