From de12be3fb1d4d272c5c64017725c273d56bf0fe9 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 19 Nov 2022 15:14:48 -0800 Subject: [PATCH] Allowlist build files in external/python/absl-py Needed because we import absl-py in our bazel.workspace file. It only worked before in b, not mixed builds, because b was run from the real android tree instead of out/soong/workspace. Bug: 234449134 Bug: 249685973 Test: Presubmits Change-Id: Ie6985582c55a4a95338fb3a8ff7b13ddb522c391 --- android/allowlists/allowlists.go | 1 + tests/bp2build_bazel_test.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 7134c7b46..500b5275f 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -364,6 +364,7 @@ var ( "external/guava":/* recursive = */ true, "external/jsr305":/* recursive = */ true, "external/protobuf":/* recursive = */ false, + "external/python/absl-py":/* recursive = */ true, // this BUILD file is globbed by //external/icu/icu4c/source:icu4c_test_data's "data/**/*". "external/icu/icu4c/source/data/unidata/norm2":/* recursive = */ false, diff --git a/tests/bp2build_bazel_test.sh b/tests/bp2build_bazel_test.sh index 679ac557c..32cb0035f 100755 --- a/tests/bp2build_bazel_test.sh +++ b/tests/bp2build_bazel_test.sh @@ -65,7 +65,7 @@ EOF outdir=out2 trap "rm -rf $outdir" EXIT # Modify OUT_DIR in a subshell so it doesn't affect the top level one. - (export OUT_DIR=$outdir; run_soong bp2build && run_bazel build --config=bp2build //a:g) + (export OUT_DIR=$outdir; run_soong bp2build && run_bazel build --config=bp2build --config=ci //a:g) } test_different_relative_outdir @@ -87,7 +87,7 @@ EOF outdir=$(mktemp -t -d st.XXXXX) trap 'rm -rf $outdir' EXIT # Modify OUT_DIR in a subshell so it doesn't affect the top level one. - (export OUT_DIR=$outdir; run_soong bp2build && run_bazel build --config=bp2build //a:g) + (export OUT_DIR=$outdir; run_soong bp2build && run_bazel build --config=bp2build --config=ci //a:g) } test_different_absolute_outdir @@ -146,7 +146,7 @@ EOF fi # NOTE: We don't actually use the extra BUILD file for anything here - run_bazel build --config=android --package_path=out/soong/workspace //foo/... + run_bazel build --config=android --config=bp2build --config=ci //foo/... local the_answer_file="bazel-out/android_target-fastbuild/bin/foo/convertible_soong_module/the_answer.txt" if [[ ! -f "${the_answer_file}" ]]; then @@ -191,10 +191,10 @@ EOF run_soong bp2build - run_bazel build --config=android --package_path=out/soong/workspace //a:qq + run_bazel build --config=android --config=bp2build --config=ci //a:qq local -r output_mtime1=$(stat -c "%y" bazel-bin/a/_objs/qq/qq.o) - run_bazel build --config=android --package_path=out/soong/workspace //a:qq + run_bazel build --config=android --config=bp2build --config=ci //a:qq local -r output_mtime2=$(stat -c "%y" bazel-bin/a/_objs/qq/qq.o) if [[ "$output_mtime1" != "$output_mtime2" ]]; then @@ -205,7 +205,7 @@ EOF #define QQ 2 EOF - run_bazel build --config=android --package_path=out/soong/workspace //a:qq + run_bazel build --config=android --config=bp2build --config=ci //a:qq local -r output_mtime3=$(stat -c "%y" bazel-bin/a/_objs/qq/qq.o) if [[ "$output_mtime1" == "$output_mtime3" ]]; then