tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds"" into main

Browse source
This commit is contained in:
Mateusz Cicheński 2023-10-17 21:04:56 +00:00 committed by Gerrit Code Review
commit 3106df7887
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/genrule_sandbox_test.py
View file

@ -61,8 +61,7 @@ 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):
# 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"})
_build_with_soong(["json-module-graph"], target_product)
with open(module_path) as f:
action_graph = json.load(f)
@ -132,7 +131,7 @@ def main():
all_outs = list(set.union(*module_to_outs.values()))
print("building without sandboxing...")
_build_with_soong(all_outs, args.target_product, extra_env={"GENRULE_SANDBOXING": "false"})
_build_with_soong(all_outs, args.target_product)
with tempfile.TemporaryDirectory() as tempdir:
for f in all_outs:
subprocess.check_call(["cp", "--parents", f, tempdir])