From d325eb349608f54d84a74ce124331a3fa170e5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Hajdan=2C=20Jr?= Date: Tue, 3 Oct 2017 17:43:37 +0200 Subject: [PATCH] gclient: make predefined variables native MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/687496 Bug: 570091 Change-Id: Ifb2c8473e1b1e8ae0c73365bc806a995ddbd7b74 Reviewed-on: https://chromium-review.googlesource.com/698066 Reviewed-by: Michael Moss Reviewed-by: Aaron Gable Commit-Queue: Paweł Hajdan Jr. --- gclient.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gclient.py b/gclient.py index 626ba80e0..fcee0a432 100755 --- a/gclient.py +++ b/gclient.py @@ -1160,13 +1160,13 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): (DEPS file contents with applied custom_vars overrides).""" # Provide some built-in variables. result = { - 'checkout_android': repr('android' in self.target_os), - 'checkout_fuchsia': repr('fuchsia' in self.target_os), - 'checkout_ios': repr('ios' in self.target_os), - 'checkout_linux': repr('unix' in self.target_os), - 'checkout_mac': repr('mac' in self.target_os), - 'checkout_win': repr('win' in self.target_os), - 'host_os': repr(_detect_host_os()), + 'checkout_android': 'android' in self.target_os, + 'checkout_fuchsia': 'fuchsia' in self.target_os, + 'checkout_ios': 'ios' in self.target_os, + 'checkout_linux': 'unix' in self.target_os, + 'checkout_mac': 'mac' in self.target_os, + 'checkout_win': 'win' in self.target_os, + 'host_os': _detect_host_os(), } # Variables defined in DEPS file override built-in ones. result.update(self._vars)