From 3bf6cd199d754cbac9692b7c4871db63a4ca6ba3 Mon Sep 17 00:00:00 2001 From: Rob Mohr Date: Fri, 5 Aug 2022 19:41:49 +0000 Subject: [PATCH] pw_env_setup: Don't clear gni vars in CIPD hook Don't clear the variables in the pigweed_environment.gni file when the CIPD post-checkout hook runs. Change-Id: I51ec6fcea4d24cdfca5aaeb975547b6fb5a2e99a Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/105157 Reviewed-by: Alexei Frolov Commit-Queue: Auto-Submit Pigweed-Auto-Submit: Rob Mohr --- pw_env_setup/py/pw_env_setup/env_setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pw_env_setup/py/pw_env_setup/env_setup.py b/pw_env_setup/py/pw_env_setup/env_setup.py index 6addb8b864..23cdbcad41 100755 --- a/pw_env_setup/py/pw_env_setup/env_setup.py +++ b/pw_env_setup/py/pw_env_setup/env_setup.py @@ -378,6 +378,9 @@ def _check_submodule_presence(self): raise MissingSubmodulesError(', '.join(sorted(missing))) def _write_gni_file(self): + if self._cipd_only: + return + gni_file = os.path.join(self._project_root, 'build_overrides', 'pigweed_environment.gni') if self._gni_file: