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

Commit f119ceb1 authored by Mateusz Cicheński's avatar Mateusz Cicheński
Browse files

Revert "Add GENRULE_SANDBOXING=false to non-sandboxed builds" 

Revert submission 2782270-genrule_sandboxing_by_default

Reason for revert: Potential culprit for b/305851039 and many other build breakages - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2782270-genrule_sandboxing_by_default

Change-Id: I7b47a92e1b315add65c8018500d9ffbd58f8f1dd
parent b36e79c7

tests/genrule_sandbox_test.py

+2 −3
Original line number Diff line number Diff line
@@ -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])