diff options
| author | Spandan Das <spandandas@google.com> | 2023-02-16 19:20:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-16 19:20:28 +0000 |
| commit | cf9d397b370334d27ea19d62567d7bd60058c62d (patch) | |
| tree | 2b24ed6f81dfd2026d7313a0a4ea0711a50e2aa5 | |
| parent | 5b5dcd2047016d451bf10c707ff942c4a798fee1 (diff) | |
| parent | f4f45220d690ba5424a81dfae7f8593a85367d21 (diff) | |
| download | orchestrator-cf9d397b370334d27ea19d62567d7bd60058c62d.tar.gz | |
Merge "Add TARGET_BUILD_VARIANT env var in ninja execution" am: f4f45220d6
Original change: https://android-review.googlesource.com/c/platform/build/orchestrator/+/2439213
Change-Id: I25fc99e4c2f6ed1aa0228b5745165b8018630678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | core/orchestrator.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/orchestrator.py b/core/orchestrator.py index efadd66..5903e47 100755 --- a/core/orchestrator.py +++ b/core/orchestrator.py @@ -204,6 +204,7 @@ class Orchestrator(): # different JDK toolchains.) # For now, set `OUT_DIR` which is inner tree agnostic. jail_cfg.add_envar(name="OUT_DIR", value=utils.choose_out_dir()) + jail_cfg.add_envar(name="TARGET_BUILD_VARIANT", value=self.variant) # Disable network access in the combined ninja execution jail_cfg.add_option(name="clone_newnet", value="true") ninja_runner.run_ninja(context, jail_cfg, targets) |