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

Commit 3c5083c0 authored by Jingwen Chen's avatar Jingwen Chen
Browse files

Revert "Fix test to use --experimental_platform_in_output_dir." 

Revert submission 1854375-update-bazel-daecf427ec0bf0e963c324783062c4f5b61ff679

Reason for revert: introduces https://cs.opensource.google/bazel/bazel/+/503d56eda25b7e2a12431411bfb7ff286d028405, which conflicts with our current cc_binary->cc_shared_library work
Reverted Changes:
I40a511195:Fix test to use --experimental_platform_in_output_...
I05c2c11f3:Update Bazel to https://github.com/bazelbuild/baze...
Ie772d1665:Set --experimental_platform_in_output_dir.
Id66674d72:Update Bazel to https://github.com/bazelbuild/baze...

Change-Id: I0e5a7548feb13c2f3b4deae1921542b15d23a283
parent c6ef451e

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