StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed bu..."

Browse Source 
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
This commit is contained in:
Cole Faust
2023-10-18 22:50:26 +00:00
committed by Gerrit Code Review
parent f119ceb1b2
commit 33d7169928
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/genrule_sandbox_test.py
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") module_path = os.path.join(out_dir, "soong", "module-actions.json")
if not os.path.exists(module_path): 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: with open(module_path) as f:
action_graph = json.load(f) action_graph = json.load(f)
@@ -131,7 +132,7 @@ def main():
all_outs = list(set.union(*module_to_outs.values())) all_outs = list(set.union(*module_to_outs.values()))
print("building without sandboxing...") 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: with tempfile.TemporaryDirectory() as tempdir:
for f in all_outs: for f in all_outs:
subprocess.check_call(["cp", "--parents", f, tempdir]) subprocess.check_call(["cp", "--parents", f, tempdir])