Add GENRULE_SANDBOXING=false to non-sandboxed builds

Because sandboxing is becoming the default.

Bug: 290816499
Test: Presubmits
Change-Id: Icd8cb70f0275bafc580c7123a9d38991ac58adbf
This commit is contained in:
Cole Faust 2023-10-11 14:52:08 -07:00
parent 7158f66753
commit b36e79c72c

View file

@ -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])