Revert "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed bu..."
Revert submission 2794133-revert-2782270-genrule_sandboxing_by_default-JMQJWWORHR
Reason for revert: Reapplying now that ag/25093969 and ag/25107100 are in
Reverted changes: /q/submissionid:2794133-revert-2782270-genrule_sandboxing_by_default-JMQJWWORHR
Change-Id: Ibb7dd6a0f925d043ab8df2f79cbcb9d30c3be458
diff --git a/tests/genrule_sandbox_test.py b/tests/genrule_sandbox_test.py
index 0cebc2a..874859a 100755
--- a/tests/genrule_sandbox_test.py
+++ b/tests/genrule_sandbox_test.py
@@ -61,7 +61,8 @@
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 @@
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])