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

Commit c361a39e authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I86e9e7b7a4ac2a510928d5eba398ee3e1fde09be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ee7878b a00cc919

tests/genrule_sandbox_test.py

+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])