Commit ed0bd7c8 authored by Yuke Liao's avatar Yuke Liao

Fix undefined gn variables in ebuild

This CL fixes errors where cros_is_vm and is_tast are undefined in an
ebuild environment.

Bug: 1168623, 1158590
Change-Id: I75ee6a9ed0b558787092bd6194a41515b1b0b50e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639309
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#845489}
parent 5891d265
......@@ -137,11 +137,12 @@ template("generate_runner_script") {
cros_board = override_board
}
cros_is_vm = false
is_tast = defined(tast_attr_expr) || defined(tast_tests)
if (is_chromeos_device && cros_sdk_version != "") {
assert(defined(generated_script),
"Must specify where to place generated test launcher script via " +
"'generated_script'")
is_tast = defined(tast_attr_expr) || defined(tast_tests)
assert(!(is_tast && defined(test_exe)),
"Tast tests are invoked from binaries shipped with the VM image. " +
"There should be no locally built binary needed.")
......@@ -150,7 +151,6 @@ template("generate_runner_script") {
# Determine the real paths for various items in the SDK, which may be used
# in the 'generate_runner_script' template below.
cros_is_vm = false
foreach(b, string_split(cros_boards_with_qemu_images, ":")) {
if (cros_board == b) {
cros_is_vm = true
......
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