Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a00cc919 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

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

parents 052f882a 33d71699
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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])