mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-24 12:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prebuilts: Create symlink for better dll lookup

Browse source 
BUG=b:253494168
TEST=prebuilt and verified the the link is created and exe run.

Change-Id: I592cb104a286dc62cc6b05aab0914d7d8a0b7ad0
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3988073
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Vikram Auradkar <auradkar@google.com>
This commit is contained in:
Vikram Auradkar 2022-10-28 00:47:33 +00:00 committed by crosvm LUCI
parent 8044443135
commit 01436598e2
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
prebuilts/src/lib.rs
View file

@ -38,10 +38,26 @@ fn get_deps_directory() -> Result<PathBuf> {
}
}
fn get_dest_path(filename: &str) -> Result<PathBuf> {
let dest = get_deps_directory()?;
// We download the prebuilt into deps directory and create a symlink to the downloaded prebuilt in
// deps parent directory.
// The symlink will help windows find the dll when an executable is manually run.
// For example, `file` is downloaded in
// `target/x86_64-pc-windows-gnu/release/deps/` and a `link` will be crated in
// `target/x86_64-pc-windows-gnu/release/`.
// Any executable in those two directories will be able to find the dlls they depend as in the same
// directory.
struct PrebuiltPath {
file: PathBuf,
link: PathBuf,
}
Ok(dest.join(filename))
fn get_dest_path(filename: &str) -> Result<PrebuiltPath> {
let deps = get_deps_directory()?;
Ok(PrebuiltPath {
file: deps.join(filename),
link: deps.parent().unwrap().join(filename),
})
}
fn get_url(library: &str, filename: &str, version: u32) -> String {
@ -76,10 +92,19 @@ fn download_file(url: &str, destination: &Path) -> Result<()> {
pub fn download_prebuilt(library: &str, version: u32, filename: &str) -> Result<PathBuf> {
let dest_path = get_dest_path(filename)?;
let url = get_url(library, filename, version);
println!("downloading prebuilt:{} to:{:?}", url, dest_path);
download_file(&url, Path::new(&dest_path))?;
Ok(dest_path)
println!("downloading prebuilt:{} to:{:?}", url, dest_path.file);
download_file(&url, Path::new(&dest_path.file))?;
println!(
"creating symlink:{:?} linking to:{:?}",
dest_path.link, dest_path.file
);
let _ = std::fs::remove_file(&dest_path.link);
#[cfg(unix)]
std::os::unix::fs::symlink(&dest_path.file, &dest_path.link)?;
#[cfg(windows)]
let _ = std::fs::copy(&dest_path.file, &dest_path.link)?;
Ok(dest_path.file)
}
/// Downloads a list of prebuilt file, with names in `filenames` of `version` from the `library`