| commit | 3c5083c058013f5f9d431927e1c0bd1f423eaf5b | [log] [tgz] |
|---|---|---|
| author | Jingwen Chen <jingwen@google.com> | Wed Oct 13 14:25:41 2021 +0000 |
| committer | Jingwen Chen <jingwen@google.com> | Wed Oct 13 14:25:41 2021 +0000 |
| tree | 6527665943d1f4741e15a9c86b6aa930529ff4ae | |
| parent | c6ef451e0ed95bdc12f59ae4c8a5f723468845dd [diff] |
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
diff --git a/tests/bp2build_bazel_test.sh b/tests/bp2build_bazel_test.sh index ed1417f..379eb65 100755 --- a/tests/bp2build_bazel_test.sh +++ b/tests/bp2build_bazel_test.sh
@@ -105,7 +105,7 @@ # 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