Revert "[gclient] Make getdep and setdep to provide builtin vars"
This reverts commit 5705acabe03a84815779adda7c0928b67dfaa6ae.
Reason for revert: breaks internal bots, e.g. see http://shortn/_KDb4blyDVz
Original change's description:
> [gclient] Make getdep and setdep to provide builtin vars
>
> Bug: 906114
> Change-Id: I069cc21343911f7fdb3c91ecbd8fcba53fc8099f
> Reviewed-on: https://chromium-review.googlesource.com/c/1340461
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Commit-Queue: Eric Boren <borenet@chromium.org>
TBR=borenet@chromium.org,ehmaldonado@chromium.org
Change-Id: I233ae7feae296fb4cd04b9b36d7f53d1114df5ff
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 906114
Reviewed-on: https://chromium-review.googlesource.com/c/1340506
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Sergiy Byelozyorov <sergiyb@chromium.org>
diff --git a/gclient.py b/gclient.py
index feb0c7d..03177c3 100755
--- a/gclient.py
+++ b/gclient.py
@@ -2831,9 +2831,7 @@
'DEPS file %s does not exist.' % options.deps_file)
with open(options.deps_file) as f:
contents = f.read()
- client = GClient.LoadCurrentConfig(options)
- local_scope = gclient_eval.Exec(contents, options.deps_file,
- builtin_vars=client.get_builtin_vars())
+ local_scope = gclient_eval.Exec(contents, options.deps_file)
for var in options.vars:
print(gclient_eval.GetVar(local_scope, var))
@@ -2883,9 +2881,7 @@
'DEPS file %s does not exist.' % options.deps_file)
with open(options.deps_file) as f:
contents = f.read()
- client = GClient.LoadCurrentConfig(options)
- local_scope = gclient_eval.Exec(contents, options.deps_file,
- builtin_vars=client.get_builtin_vars())
+ local_scope = gclient_eval.Exec(contents, options.deps_file)
for var in options.vars:
name, _, value = var.partition('=')