From caf321aaa680f50a7dd091ed91cf0d2d1880b897 Mon Sep 17 00:00:00 2001 From: Nathan Mulcahey Date: Wed, 2 Jan 2019 16:17:22 +0000 Subject: [PATCH] [fuchsia] Handle `host_{cpu,os}` vars in DEPS Inject default values for environment vars now present in DEPS after https://dart-review.googlesource.com/c/sdk/+/85416 Change-Id: Icd43f7b0f379725434d591c6495551529f041979 Reviewed-on: https://dart-review.googlesource.com/c/88140 Reviewed-by: Zach Anderson Commit-Queue: Zach Anderson --- tools/create_pkg_manifest.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/create_pkg_manifest.py b/tools/create_pkg_manifest.py index dd0c6d8f047..c49eac89660 100755 --- a/tools/create_pkg_manifest.py +++ b/tools/create_pkg_manifest.py @@ -21,6 +21,11 @@ DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..')) # Used in parsing the DEPS file. class VarImpl(object): + _env_vars = { + "host_cpu": "x64", + "host_os": "linux", + } + def __init__(self, local_scope): self._local_scope = local_scope @@ -28,6 +33,9 @@ class VarImpl(object): """Implements the Var syntax.""" if var_name in self._local_scope.get("vars", {}): return self._local_scope["vars"][var_name] + # Inject default values for env variables + if var_name in self._env_vars: + return self._env_vars[var_name] raise Exception("Var is not defined: %s" % var_name)