Commit 7339fe55 authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

DEPS: Default cros_board to empty

Changes the default cros_board value in DEPS from "amd64-generic" to the
empty string.

Changes the cros SDK deps to then be additionally gated on cros_board
being non-empty.

This is in preparation for setting target_os=["chromeos"] in gclient
configs for all Chrome OS builders, including desktop Chrome OS,
without causing the latter to pull in unnecessary SDK deps.

Bug: 822034
Change-Id: I04b62c366731e4c18722df45767a2868c10d8b11
Reviewed-on: https://chromium-review.googlesource.com/1036003Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554877}
parent 05311019
......@@ -69,8 +69,9 @@ vars = {
'checkout_traffic_annotation_tools': 'checkout_configuration == "default"',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
# Define the default board to be targetted when building for CrOS.
'cros_board': 'amd64-generic',
# Default to the empty board. Desktop Chrome OS builds don't need cros SDK
# dependencies. Other Chrome OS builds should always define this explicitly.
'cros_board': '',
# Surround the board var in quotes so gclient doesn't try parsing the string
# as an expression.
'cros_download_vm': '"{cros_board}" == "amd64-generic"',
......@@ -2011,7 +2012,7 @@ hooks = [
'name': 'cros_simplechrome_artifacts_with_vm',
'pattern': '.',
# Building for CrOS is only supported on linux currently.
'condition': '(checkout_chromeos and host_os == "linux") and cros_download_vm',
'condition': '((checkout_chromeos and host_os == "linux") and cros_download_vm) and ("{cros_board}" != "")',
'action': [
'src/third_party/chromite/bin/cros',
'chrome-sdk',
......@@ -2032,7 +2033,7 @@ hooks = [
'name': 'cros_simplechrome_artifacts_with_no_vm',
'pattern': '.',
# Building for CrOS is only supported on linux currently.
'condition': '(checkout_chromeos and host_os == "linux") and not cros_download_vm',
'condition': '((checkout_chromeos and host_os == "linux") and not cros_download_vm) and ("{cros_board}" != "")',
'action': [
'src/third_party/chromite/bin/cros',
'chrome-sdk',
......
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