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

Commit 2ddc1eb1 authored by Jingwen Chen's avatar Jingwen Chen Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix test to use --experimental_platform_in_output_dir."" am: 7b568c1c 

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

Change-Id: If085d93a11035ba47310bddafd94e4c19f83ff19
parents 964d2d7a 7b568c1c

tests/bp2build_bazel_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ EOF 
  # NOTE: We don't actually use the extra BUILD file for anything here

  run_bazel build --package_path=out/soong/workspace //foo/...



  local the_answer_file="bazel-out/android_target-fastbuild/bin/foo/convertible_soong_module/the_answer.txt"

  local the_answer_file="bazel-out/k8-fastbuild/bin/foo/convertible_soong_module/the_answer.txt"

  if [[ ! -f "${the_answer_file}" ]]; then

    fail "Expected '${the_answer_file}' to be generated, but was missing"

  fi