Commit 2de9adc9 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Fix path to qemu dir for cros VM tests.

And also roll chromite.

The latest roll is blocked due to the path changing slightly:
https://chromium-review.googlesource.com/c/chromium/src/+/1306765

NOTRY=true

Bug: 897540
Change-Id: Idc753e8b79dcf4c231e05fb9bb6ba3ad7b52592f
Reviewed-on: https://chromium-review.googlesource.com/c/1308014
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarAchuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604020}
parent a395bea8
...@@ -650,7 +650,7 @@ deps = { ...@@ -650,7 +650,7 @@ deps = {
# Build tools for Chrome OS. Note: This depends on third_party/pyelftools. # Build tools for Chrome OS. Note: This depends on third_party/pyelftools.
'src/third_party/chromite': { 'src/third_party/chromite': {
'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '5a5616f3bb3bc706fbd30d3b4fc6eee710ea2d7a', 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '761322d458eaa3e6dde21e5739accfa03884a26e',
'condition': 'checkout_linux', 'condition': 'checkout_linux',
}, },
......
...@@ -33,7 +33,7 @@ template("generate_vm_runner_script") { ...@@ -33,7 +33,7 @@ template("generate_vm_runner_script") {
_cache_path_prefix = _cache_path_prefix =
"//build/cros_cache/chrome-sdk/tarballs/${cros_board}+${cros_sdk_version}" "//build/cros_cache/chrome-sdk/tarballs/${cros_board}+${cros_sdk_version}"
_vm_image_path = "${_cache_path_prefix}+chromiumos_qemu_image.tar.xz/" _vm_image_path = "${_cache_path_prefix}+chromiumos_qemu_image.tar.xz/"
_qemu_dir = "${_cache_path_prefix}+qemu/" _qemu_dir = "${_cache_path_prefix}+app-emulation/"
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment