diff options
author | 2023-10-11 14:52:08 -0700 | |
---|---|---|
committer | 2023-10-11 14:52:08 -0700 | |
commit | b36e79c72c21948100fc1e026e0175c851884e7b (patch) | |
tree | 1082642ae6a9adb51553ad85152fe95321699d4b | |
parent | 7158f66753197973eba62de4802268f37273fc92 (diff) |
Add GENRULE_SANDBOXING=false to non-sandboxed builds
Because sandboxing is becoming the default.
Bug: 290816499
Test: Presubmits
Change-Id: Icd8cb70f0275bafc580c7123a9d38991ac58adbf
-rwxr-xr-x | tests/genrule_sandbox_test.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/genrule_sandbox_test.py b/tests/genrule_sandbox_test.py index 0cebc2aa0..874859ad9 100755 --- a/tests/genrule_sandbox_test.py +++ b/tests/genrule_sandbox_test.py @@ -61,7 +61,8 @@ def _find_outputs_for_modules(modules, out_dir, target_product): module_path = os.path.join(out_dir, "soong", "module-actions.json") if not os.path.exists(module_path): - _build_with_soong(["json-module-graph"], target_product) + # Use GENRULE_SANDBOXING=false so that we don't cause re-analysis later when we do the no-sandboxing build + _build_with_soong(["json-module-graph"], target_product, extra_env={"GENRULE_SANDBOXING": "false"}) with open(module_path) as f: action_graph = json.load(f) @@ -131,7 +132,7 @@ def main(): all_outs = list(set.union(*module_to_outs.values())) print("building without sandboxing...") - _build_with_soong(all_outs, args.target_product) + _build_with_soong(all_outs, args.target_product, extra_env={"GENRULE_SANDBOXING": "false"}) with tempfile.TemporaryDirectory() as tempdir: for f in all_outs: subprocess.check_call(["cp", "--parents", f, tempdir]) |