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

Merge "Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds"" into main am: 3106df7887

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794132

Change-Id: Ia58f9152307a87650ffa9c4bef978ba6187a50d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2023-10-17 21:07:12 +00:00
committed by Automerger Merge Worker
parent 741711dbfa 3106df7887
commit 9b243056f4
1 changed files with 2 additions and 3 deletions
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])