Skip to content

Update crosvm pin and build hacks, then package the executable #1634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Databean wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update crosvm pin and build hacks, then package the executable #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions base/cvd/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ bazel_dep(name = "zlib", version = "1.3.1.bcr.5")

# this needs to be at parity with with build_external/crosvm/crosvm.config.toml
CROSVM_REMOTE = "https://chromium.googlesource.com/crosvm/crosvm"
CROSVM_REV = "bc84c8bd6ce078e251594aa1af9e84932c5d0d81"
CROSVM_REV = "d3175012b887aee0dc5767aa05cfdab901d65798"

# Hedron's Compile Commands Extractor for Bazel
# https://github.com/hedronvision/bazel-compile-commands-extractor
Expand Down Expand Up @@ -214,7 +214,6 @@ crosvm_bin.spec(
"qcow",
"usb",
],
# TODO: schuffelen - fix the sandbox
git = CROSVM_REMOTE,
rev = CROSVM_REV,
)
Expand Down Expand Up @@ -263,7 +262,7 @@ crosvm_bin.annotation(
crosvm_bin.annotation(
crate = "minijail-sys",
build_script_data = ["@@//:minijail_sources"],
build_script_rundir = "external/+_repo_rules2+crosvm/third_party/minijail",
build_script_rundir = "external/+_repo_rules3+crosvm/third_party/minijail",
patch_args = ["-p1"],
# crates_universe checks out only a subdirectory of the repository, so the
# file paths in this patch are relative to that directory.
Expand Down
4 changes: 2 additions & 2 deletions base/cvd/build_external/crosvm/crosvm.config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[patch.crates-io]
# this needs to be at parity with MODULE.bazel
audio_streams = { git = "https://chromium.googlesource.com/crosvm/crosvm", rev = "bc84c8bd6ce078e251594aa1af9e84932c5d0d81" }
libcras = { git = "https://chromium.googlesource.com/crosvm/crosvm", rev = "bc84c8bd6ce078e251594aa1af9e84932c5d0d81" }
audio_streams = { git = "https://chromium.googlesource.com/crosvm/crosvm", rev = "d3175012b887aee0dc5767aa05cfdab901d65798" }
libcras = { git = "https://chromium.googlesource.com/crosvm/crosvm", rev = "d3175012b887aee0dc5767aa05cfdab901d65798" }
# this needs to be at parity with the crosvm submodule third_party/minijail
minijail = { git = "https://chromium.googlesource.com/chromiumos/platform/minijail", rev = "fc020fd4672b3340ee706e192d043e12df8c8578" }
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/package/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ package_files(
"cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/iccprofile_for_sim0_for_CtsCarrierApiTestCases.xml",
"cuttlefish-common/etc/modem_simulator/files/iccprofile_for_sim0.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/iccprofile_for_sim0.xml",
"cuttlefish-common/etc/modem_simulator/files/numeric_operator.xml": "//cuttlefish/host/commands/modem_simulator:etc/files/numeric_operator.xml",
# "cuttlefish-common/bin/crosvm": "@crosvm_bin//:crosvm__crosvm", # TODO: b/402274999 - currently requires --enable_sandbox=false
"cuttlefish-common/bin/crosvm": "@crosvm_bin//:crosvm__crosvm", # TODO: b/402274999 - currently requires --enable_sandbox=false
"cuttlefish-common/usr/share/webrtc/assets/client.html": "//cuttlefish/host/frontend/webrtc/html_client:client.html",
"cuttlefish-common/usr/share/webrtc/assets/controls.css": "//cuttlefish/host/frontend/webrtc/html_client:controls.css",
"cuttlefish-common/usr/share/webrtc/assets/custom.css": "//cuttlefish/host/frontend/webrtc/html_client:custom.css",
Expand Down
2 changes: 2 additions & 0 deletions base/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Build-Depends: bazel [amd64],
debhelper-compat (= 12),
git,
libaom-dev,
libcap-dev,
libclang-dev,
libcurl4-openssl-dev,
libfmt-dev,
Expand All @@ -22,6 +23,7 @@ Build-Depends: bazel [amd64],
libsrtp2-dev,
libssl-dev,
libtinfo5,
libwayland-dev,
libxml2-dev,
libz3-dev,
pkgconf,
Expand Down
Loading