diff --git a/Cargo.lock b/Cargo.lock index 2ca25848164..d61e1ed7150 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5515,17 +5515,6 @@ dependencies = [ "serde_bytes", ] -[[package]] -name = "ic-canister-sandbox-launcher" -version = "0.9.0" -dependencies = [ - "cc", - "ic-canister-sandbox-common", - "ic-test-utilities", - "ic-types", - "nix 0.24.3", -] - [[package]] name = "ic-canister-sandbox-replica-controller" version = "0.9.0" @@ -7380,7 +7369,6 @@ dependencies = [ "clap 3.2.25", "hex", "ic-canister-sandbox-backend-lib", - "ic-canister-sandbox-launcher", "ic-config", "ic-cycles-account-manager", "ic-error-types", @@ -9708,7 +9696,6 @@ dependencies = [ "ic-artifact-pool", "ic-base-types", "ic-canister-sandbox-backend-lib", - "ic-canister-sandbox-launcher", "ic-config", "ic-crypto-utils-threshold-sig-der", "ic-cup-explorer", @@ -10037,7 +10024,6 @@ dependencies = [ "ic-artifact-pool", "ic-canister-client", "ic-canister-sandbox-backend-lib", - "ic-canister-sandbox-launcher", "ic-config", "ic-consensus", "ic-consensus-utils", diff --git a/Cargo.toml b/Cargo.toml index f06ec6e77cb..3cd70c5e381 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,6 @@ members = [ "rs/canister_sandbox", "rs/canister_sandbox/common", "rs/canister_sandbox/replica_controller", - "rs/canister_sandbox/sandbox_launcher", "rs/canonical_state", "rs/canonical_state/tree_hash", "rs/canonical_state/tree_hash/test_utils", diff --git a/bazel/defs.bzl b/bazel/defs.bzl index 23673bc12e0..39d4f9dc933 100644 --- a/bazel/defs.bzl +++ b/bazel/defs.bzl @@ -157,12 +157,12 @@ def sha256sum2url(name, src, tags = [], **kwargs): # Binaries needed for testing with canister_sandbox _SANDBOX_DATA = [ "//rs/canister_sandbox", - "//rs/canister_sandbox/sandbox_launcher", + "//rs/canister_sandbox:sandbox_launcher", ] # Env needed for testing with canister_sandbox _SANDBOX_ENV = { - "LAUNCHER_BINARY": "$(rootpath //rs/canister_sandbox/sandbox_launcher)", + "LAUNCHER_BINARY": "$(rootpath //rs/canister_sandbox:sandbox_launcher)", "SANDBOX_BINARY": "$(rootpath //rs/canister_sandbox)", } diff --git a/publish/binaries/BUILD.bazel b/publish/binaries/BUILD.bazel index 02b2b803910..b599999a0cf 100644 --- a/publish/binaries/BUILD.bazel +++ b/publish/binaries/BUILD.bazel @@ -54,7 +54,7 @@ BINARIES = { "metrics-proxy": "@crate_index//:metrics-proxy__metrics-proxy", "nfplot": "//rs/nervous_system/neurons_fund/nfplot", "orchestrator": "//rs/orchestrator", - "sandbox_launcher": "//rs/canister_sandbox/sandbox_launcher", + "sandbox_launcher": "//rs/canister_sandbox:sandbox_launcher", "setupos_tool": "//rs/ic_os/setupos_tool:setupos_tool", "snptool": "//rs/ic_os/snptool:snptool", "sns": "//rs/sns/cli:sns", diff --git a/rs/canister_sandbox/BUILD.bazel b/rs/canister_sandbox/BUILD.bazel index 7675b333146..eb484ed1fd7 100644 --- a/rs/canister_sandbox/BUILD.bazel +++ b/rs/canister_sandbox/BUILD.bazel @@ -78,3 +78,11 @@ rust_binary( "@crate_index//:libc", ], ) + +# `sandbox_launcher` executable name referenced by code and other scripts. +# Therefore reserve that name for the rust binary. +rust_binary( + name = "sandbox_launcher", + srcs = ["bin/sandbox_launcher.rs"], + deps = [":backend_lib"], +) diff --git a/rs/canister_sandbox/Cargo.toml b/rs/canister_sandbox/Cargo.toml index 1e08ed898d6..e63e6cceedc 100644 --- a/rs/canister_sandbox/Cargo.toml +++ b/rs/canister_sandbox/Cargo.toml @@ -50,3 +50,7 @@ sigsegv_handler_checksum = ["memory_tracker/sigsegv_handler_checksum"] [[bin]] name = "canister_sandbox" path = "src/main.rs" + +[[bin]] +name = "sandbox_launcher" +path = "bin/sandbox_launcher.rs" diff --git a/rs/canister_sandbox/bin/sandbox_launcher.rs b/rs/canister_sandbox/bin/sandbox_launcher.rs new file mode 100644 index 00000000000..2d3c10be8c5 --- /dev/null +++ b/rs/canister_sandbox/bin/sandbox_launcher.rs @@ -0,0 +1,3 @@ +fn main() { + ic_canister_sandbox_backend_lib::launcher::sandbox_launcher_main(); +} diff --git a/rs/canister_sandbox/sandbox_launcher/BUILD.bazel b/rs/canister_sandbox/sandbox_launcher/BUILD.bazel deleted file mode 100644 index e7bdffb28f9..00000000000 --- a/rs/canister_sandbox/sandbox_launcher/BUILD.bazel +++ /dev/null @@ -1,25 +0,0 @@ -load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -DEPENDENCIES = [ - "//rs/canister_sandbox/common", - "//rs/types/types", - "@crate_index//:nix", -] - -rust_library( - name = "sandbox_launcher_lib", - srcs = glob(["src/**"]), - crate_name = "ic_canister_sandbox_launcher", - version = "0.9.0", - deps = DEPENDENCIES, -) - -# `sandbox_launcher` executable name referenced by code and other scripts. -# Therefore reserve that name for the rust binary. -rust_binary( - name = "sandbox_launcher", - srcs = ["bin/sandbox_launcher.rs"], - deps = [":sandbox_launcher_lib"], -) diff --git a/rs/canister_sandbox/sandbox_launcher/Cargo.toml b/rs/canister_sandbox/sandbox_launcher/Cargo.toml deleted file mode 100644 index 0d966e15fc1..00000000000 --- a/rs/canister_sandbox/sandbox_launcher/Cargo.toml +++ /dev/null @@ -1,32 +0,0 @@ -[package] -name = "ic-canister-sandbox-launcher" -version.workspace = true -authors.workspace = true -edition.workspace = true -description.workspace = true -documentation.workspace = true - -[build-dependencies] -cc = "1.0" - -[dependencies] -ic-canister-sandbox-common = { path = "../common" } -ic-types = { path = "../../types/types" } -nix = { workspace = true } - -[dev-dependencies] -# This makes the dependencies of the binary more consistent -# with the dependencies of execution environment tests and -# allows the binary to reuse most of the build artifacts -# produced by `cargo test`. -ic-test-utilities = { path = "../../test_utilities" } - -[[bin]] -name = "sandbox_launcher" -path = "bin/sandbox_launcher.rs" - -# This feature doesn't actually do anything. It is just convenient because it -# allows us to use the same cargo flags for building sandbox_launcher as we have -# for canister_sandbox. -[features] -sigsegv_handler_checksum = [] diff --git a/rs/canister_sandbox/sandbox_launcher/bin/sandbox_launcher.rs b/rs/canister_sandbox/sandbox_launcher/bin/sandbox_launcher.rs deleted file mode 100644 index 8658fa080f0..00000000000 --- a/rs/canister_sandbox/sandbox_launcher/bin/sandbox_launcher.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - ic_canister_sandbox_launcher::sandbox_launcher_main(); -} diff --git a/rs/canister_sandbox/sandbox_launcher/build.rs b/rs/canister_sandbox/sandbox_launcher/build.rs deleted file mode 100644 index 71cbdd58fa0..00000000000 --- a/rs/canister_sandbox/sandbox_launcher/build.rs +++ /dev/null @@ -1,10 +0,0 @@ -fn main() { - if std::env::var("TARGET").unwrap() == "x86_64-unknown-linux-gnu" { - cc::Build::new() - .file("../src/backtrace.c") - .debug(false) - .compile("backtrace"); - println!("cargo:rerun-if-changed=../src/backtrace.c"); - println!("cargo:rustc-link-lib=dylib=unwind"); - } -} diff --git a/rs/canister_sandbox/sandbox_launcher/src/lib.rs b/rs/canister_sandbox/src/launcher.rs similarity index 100% rename from rs/canister_sandbox/sandbox_launcher/src/lib.rs rename to rs/canister_sandbox/src/launcher.rs diff --git a/rs/canister_sandbox/src/lib.rs b/rs/canister_sandbox/src/lib.rs index 50ef31f3f13..148ce0d3d2c 100644 --- a/rs/canister_sandbox/src/lib.rs +++ b/rs/canister_sandbox/src/lib.rs @@ -1,4 +1,5 @@ mod dts; +pub mod launcher; pub mod logging; pub mod sandbox_manager; pub mod sandbox_server; diff --git a/rs/drun/BUILD.bazel b/rs/drun/BUILD.bazel index 31db80cd34f..47fd508946e 100644 --- a/rs/drun/BUILD.bazel +++ b/rs/drun/BUILD.bazel @@ -4,7 +4,6 @@ package(default_visibility = ["//visibility:public"]) DEPENDENCIES = [ "//rs/canister_sandbox:backend_lib", - "//rs/canister_sandbox/sandbox_launcher:sandbox_launcher_lib", "//rs/config", "//rs/cycles_account_manager", "//rs/execution_environment", diff --git a/rs/drun/Cargo.toml b/rs/drun/Cargo.toml index cbe3bb06ab0..3fcebeb7202 100644 --- a/rs/drun/Cargo.toml +++ b/rs/drun/Cargo.toml @@ -8,7 +8,6 @@ documentation.workspace = true [dependencies] ic-canister-sandbox-backend-lib = { path = "../canister_sandbox" } -ic-canister-sandbox-launcher = { path = "../canister_sandbox/sandbox_launcher" } ic-config = { path = "../config" } ic-cycles-account-manager = { path = "../cycles_account_manager" } ic-error-types = { path = "../types/error_types" } diff --git a/rs/drun/src/main.rs b/rs/drun/src/main.rs index 3f4e3d1f5a8..0ad5b65eea1 100644 --- a/rs/drun/src/main.rs +++ b/rs/drun/src/main.rs @@ -1,8 +1,8 @@ use clap::{Arg, ArgAction, ArgMatches, Command}; use ic_canister_sandbox_backend_lib::{ - canister_sandbox_main, RUN_AS_CANISTER_SANDBOX_FLAG, RUN_AS_SANDBOX_LAUNCHER_FLAG, + canister_sandbox_main, launcher::sandbox_launcher_main, RUN_AS_CANISTER_SANDBOX_FLAG, + RUN_AS_SANDBOX_LAUNCHER_FLAG, }; -use ic_canister_sandbox_launcher::sandbox_launcher_main; use ic_config::{embedders::MeteringType, flag_status::FlagStatus, Config, ConfigSource}; use ic_drun::{run_drun, DrunOptions}; use ic_registry_subnet_type::SubnetType; diff --git a/rs/ethereum/ledger-suite-orchestrator/BUILD.bazel b/rs/ethereum/ledger-suite-orchestrator/BUILD.bazel index 3f2ace2a47f..4c6c374f8f7 100644 --- a/rs/ethereum/ledger-suite-orchestrator/BUILD.bazel +++ b/rs/ethereum/ledger-suite-orchestrator/BUILD.bazel @@ -108,7 +108,7 @@ rust_test( data = [ "ledger_suite_orchestrator_canister.wasm", "//rs/canister_sandbox", - "//rs/canister_sandbox/sandbox_launcher", + "//rs/canister_sandbox:sandbox_launcher", "//rs/rosetta-api/icrc1/archive:archive_canister_u256.wasm.gz", "//rs/rosetta-api/icrc1/index-ng:index_ng_canister_u256.wasm.gz", "//rs/rosetta-api/icrc1/ledger:ledger_canister_u256.wasm.gz", @@ -119,7 +119,7 @@ rust_test( "LEDGER_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/ledger:ledger_canister_u256.wasm.gz)", "INDEX_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/index-ng:index_ng_canister_u256.wasm.gz)", "LEDGER_ARCHIVE_NODE_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/archive:archive_canister_u256.wasm.gz)", - "LAUNCHER_BINARY": "$(rootpath //rs/canister_sandbox/sandbox_launcher)", + "LAUNCHER_BINARY": "$(rootpath //rs/canister_sandbox:sandbox_launcher)", "SANDBOX_BINARY": "$(rootpath //rs/canister_sandbox)", }, proc_macro_deps = [ diff --git a/rs/recovery/BUILD.bazel b/rs/recovery/BUILD.bazel index 4dd7a34b7b3..1e8f8ec5583 100644 --- a/rs/recovery/BUILD.bazel +++ b/rs/recovery/BUILD.bazel @@ -73,7 +73,6 @@ rust_binary( deps = DEPENDENCIES + [ ":recovery", "//rs/canister_sandbox:backend_lib", - "//rs/canister_sandbox/sandbox_launcher:sandbox_launcher_lib", ], ) diff --git a/rs/recovery/Cargo.toml b/rs/recovery/Cargo.toml index d7c6e7152b8..384cf7e6c6c 100644 --- a/rs/recovery/Cargo.toml +++ b/rs/recovery/Cargo.toml @@ -11,7 +11,6 @@ hex = "0.4.2" ic-artifact-pool = { path = "../artifact_pool" } ic-base-types = { path = "../types/base_types/" } ic-canister-sandbox-backend-lib = { path = "../canister_sandbox" } -ic-canister-sandbox-launcher = { path = "../canister_sandbox/sandbox_launcher" } ic-config = { path = "../config" } ic-crypto-utils-threshold-sig-der = { path = "../crypto/utils/threshold_sig_der" } ic-cup-explorer = { path = "../cup_explorer" } diff --git a/rs/recovery/src/main.rs b/rs/recovery/src/main.rs index 2e0ded26ffc..cc5da809a64 100644 --- a/rs/recovery/src/main.rs +++ b/rs/recovery/src/main.rs @@ -2,9 +2,9 @@ //! Calls the corresponding recovery process CLI. use clap::Parser; use ic_canister_sandbox_backend_lib::{ - canister_sandbox_main, RUN_AS_CANISTER_SANDBOX_FLAG, RUN_AS_SANDBOX_LAUNCHER_FLAG, + canister_sandbox_main, launcher::sandbox_launcher_main, RUN_AS_CANISTER_SANDBOX_FLAG, + RUN_AS_SANDBOX_LAUNCHER_FLAG, }; -use ic_canister_sandbox_launcher::sandbox_launcher_main; use ic_recovery::cmd::{RecoveryToolArgs, SubCommand}; use ic_recovery::RecoveryArgs; use ic_recovery::{cli, util}; diff --git a/rs/recovery/subnet_splitting/BUILD.bazel b/rs/recovery/subnet_splitting/BUILD.bazel index 7f9761612ad..c85c02e5f70 100644 --- a/rs/recovery/subnet_splitting/BUILD.bazel +++ b/rs/recovery/subnet_splitting/BUILD.bazel @@ -56,7 +56,6 @@ rust_binary( deps = DEPENDENCIES + [ ":subnet_splitting", "//rs/canister_sandbox:backend_lib", - "//rs/canister_sandbox/sandbox_launcher:sandbox_launcher_lib", ], ) diff --git a/rs/replay/BUILD.bazel b/rs/replay/BUILD.bazel index 93441fb7474..01028d1d18f 100644 --- a/rs/replay/BUILD.bazel +++ b/rs/replay/BUILD.bazel @@ -6,7 +6,6 @@ DEPENDENCIES = [ "//rs/artifact_pool", "//rs/canister_client", "//rs/canister_sandbox:backend_lib", - "//rs/canister_sandbox/sandbox_launcher:sandbox_launcher_lib", "//rs/config", "//rs/consensus", "//rs/consensus/utils", diff --git a/rs/replay/Cargo.toml b/rs/replay/Cargo.toml index dd22209ef8d..35167e9e4f7 100644 --- a/rs/replay/Cargo.toml +++ b/rs/replay/Cargo.toml @@ -13,7 +13,6 @@ hex = "0.4.2" ic-artifact-pool = { path = "../artifact_pool" } ic-canister-client = { path = "../canister_client" } ic-canister-sandbox-backend-lib = { path = "../canister_sandbox" } -ic-canister-sandbox-launcher = { path = "../canister_sandbox/sandbox_launcher" } ic-config = { path = "../config" } ic-consensus = { path = "../consensus" } ic-consensus-utils = { path = "../consensus/utils" } diff --git a/rs/replay/src/main.rs b/rs/replay/src/main.rs index 2db41c8909d..262a5460773 100644 --- a/rs/replay/src/main.rs +++ b/rs/replay/src/main.rs @@ -2,9 +2,9 @@ use clap::Parser; use ic_canister_sandbox_backend_lib::{ - canister_sandbox_main, RUN_AS_CANISTER_SANDBOX_FLAG, RUN_AS_SANDBOX_LAUNCHER_FLAG, + canister_sandbox_main, launcher::sandbox_launcher_main, RUN_AS_CANISTER_SANDBOX_FLAG, + RUN_AS_SANDBOX_LAUNCHER_FLAG, }; -use ic_canister_sandbox_launcher::sandbox_launcher_main; use ic_replay::cmd::ReplayToolArgs; use ic_replay::replay; diff --git a/rs/rosetta-api/icp_ledger/rosetta-integration-tests/BUILD.bazel b/rs/rosetta-api/icp_ledger/rosetta-integration-tests/BUILD.bazel index 4ec0168a51d..879d0ed424e 100644 --- a/rs/rosetta-api/icp_ledger/rosetta-integration-tests/BUILD.bazel +++ b/rs/rosetta-api/icp_ledger/rosetta-integration-tests/BUILD.bazel @@ -37,7 +37,7 @@ rust_test_suite( srcs = ["tests/tests.rs"], data = [ "//rs/canister_sandbox", - "//rs/canister_sandbox/sandbox_launcher", + "//rs/canister_sandbox:sandbox_launcher", "//rs/replica", "//rs/rosetta-api:ic-rosetta-api", "//rs/rosetta-api/icp_ledger/ledger:ledger-canister-wasm-notify-method", @@ -47,7 +47,7 @@ rust_test_suite( "CANISTER_LAUNCHER": "$(rootpath //rs/canister_sandbox)", "LEDGER_CANISTER_NOTIFY_METHOD_WASM_PATH": "$(rootpath //rs/rosetta-api/icp_ledger/ledger:ledger-canister-wasm-notify-method)", "REPLICA_BIN": "$(rootpath //rs/replica)", - "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox/sandbox_launcher)", + "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox:sandbox_launcher)", "STARTER_BIN": "$(rootpath //rs/starter:ic-starter)", "ROSETTA_PATH": "$(rootpath //rs/rosetta-api:ic-rosetta-api)", }, diff --git a/rs/rosetta-api/icrc1/rosetta/BUILD.bazel b/rs/rosetta-api/icrc1/rosetta/BUILD.bazel index bfe6e2fe3df..1469009cb86 100644 --- a/rs/rosetta-api/icrc1/rosetta/BUILD.bazel +++ b/rs/rosetta-api/icrc1/rosetta/BUILD.bazel @@ -105,7 +105,7 @@ rust_test( LOCAL_REPLICA_DATA = [ "//rs/canister_sandbox", - "//rs/canister_sandbox/sandbox_launcher", + "//rs/canister_sandbox:sandbox_launcher", "//rs/replica", "//rs/rosetta-api/icrc1/archive:archive_canister", "//rs/rosetta-api/icrc1/ledger:ledger_canister", @@ -119,7 +119,7 @@ LOCAL_REPLICA_ENV = { "IC_ICRC1_LEDGER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/ledger:ledger_canister)", "REPLICA_BIN": "$(rootpath //rs/replica)", "ROSETTA_BIN_PATH": "$(rootpath //rs/rosetta-api/icrc1/rosetta:ic-icrc-rosetta-bin)", - "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox/sandbox_launcher)", + "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox:sandbox_launcher)", "STARTER_BIN": "$(rootpath //rs/starter:ic-starter)", } diff --git a/rs/rosetta-api/icrc1/rosetta/client/BUILD.bazel b/rs/rosetta-api/icrc1/rosetta/client/BUILD.bazel index 1e389825d0e..dde2207aeef 100644 --- a/rs/rosetta-api/icrc1/rosetta/client/BUILD.bazel +++ b/rs/rosetta-api/icrc1/rosetta/client/BUILD.bazel @@ -22,7 +22,7 @@ rust_test( srcs = ["test/tests.rs"], data = [ "//rs/canister_sandbox", - "//rs/canister_sandbox/sandbox_launcher", + "//rs/canister_sandbox:sandbox_launcher", "//rs/replica", "//rs/rosetta-api/icrc1/rosetta:ic-icrc-rosetta-bin", "//rs/starter:ic-starter", @@ -31,7 +31,7 @@ rust_test( "CANISTER_LAUNCHER": "$(rootpath //rs/canister_sandbox)", "REPLICA_BIN": "$(rootpath //rs/replica)", "ROSETTA_BIN_PATH": "$(rootpath //rs/rosetta-api/icrc1/rosetta:ic-icrc-rosetta-bin)", - "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox/sandbox_launcher)", + "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox:sandbox_launcher)", "STARTER_BIN": "$(rootpath //rs/starter:ic-starter)", }, deps = [ diff --git a/rs/rosetta-api/icrc1/rosetta/runner/BUILD.bazel b/rs/rosetta-api/icrc1/rosetta/runner/BUILD.bazel index 5b29fe09309..c9a602c45e4 100644 --- a/rs/rosetta-api/icrc1/rosetta/runner/BUILD.bazel +++ b/rs/rosetta-api/icrc1/rosetta/runner/BUILD.bazel @@ -18,7 +18,7 @@ rust_test( srcs = ["test/tests.rs"], data = [ "//rs/canister_sandbox", - "//rs/canister_sandbox/sandbox_launcher", + "//rs/canister_sandbox:sandbox_launcher", "//rs/replica", "//rs/rosetta-api/icrc1/rosetta:ic-icrc-rosetta-bin", "//rs/starter:ic-starter", @@ -27,7 +27,7 @@ rust_test( "CANISTER_LAUNCHER": "$(rootpath //rs/canister_sandbox)", "REPLICA_BIN": "$(rootpath //rs/replica)", "ROSETTA_BIN_PATH": "$(rootpath //rs/rosetta-api/icrc1/rosetta:ic-icrc-rosetta-bin)", - "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox/sandbox_launcher)", + "SANDBOX_LAUNCHER": "$(rootpath //rs/canister_sandbox:sandbox_launcher)", "STARTER_BIN": "$(rootpath //rs/starter:ic-starter)", }, deps = [ diff --git a/rs/tests/BUILD.bazel b/rs/tests/BUILD.bazel index eeb4522c565..fa55b2c066a 100644 --- a/rs/tests/BUILD.bazel +++ b/rs/tests/BUILD.bazel @@ -133,8 +133,8 @@ symlink_dir( targets = { "//rs/registry/admin:ic-admin": "ic-admin", "//rs/state_tool:state-tool": "state-tool", - "//rs/canister_sandbox/sandbox_launcher": "sandbox_launcher", - "//rs/canister_sandbox": "canister_sandbox", + "//rs/canister_sandbox:sandbox_launcher": "sandbox_launcher", + "//rs/canister_sandbox:canister_sandbox": "canister_sandbox", "@crate_index//:ic-wasm__ic-wasm": "ic-wasm", }, ) @@ -144,8 +144,8 @@ symlink_dir( targets = { "//rs/backup:ic-backup": "ic-backup", "//rs/replay:ic-replay": "ic-replay", - "//rs/canister_sandbox/sandbox_launcher": "sandbox_launcher", - "//rs/canister_sandbox": "canister_sandbox", + "//rs/canister_sandbox:sandbox_launcher": "sandbox_launcher", + "//rs/canister_sandbox:canister_sandbox": "canister_sandbox", }, )