diff options
| author | 2022-12-15 20:23:35 +0000 | |
|---|---|---|
| committer | 2022-12-15 20:23:35 +0000 | |
| commit | a6d4e15c3afe686f9c06d1cd2ffe643f7a2e4880 (patch) | |
| tree | 4578a71ebf8cc51e71cbba865a44ae566f25e84e | |
| parent | e7e9e09128ee1d269899b20b567936b7304f2bfb (diff) | |
| parent | de12be3fb1d4d272c5c64017725c273d56bf0fe9 (diff) | |
Merge "Allowlist build files in external/python/absl-py"
| -rw-r--r-- | android/allowlists/allowlists.go | 1 | ||||
| -rwxr-xr-x | 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 06527bfca..4ea0a0fb6 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -365,6 +365,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 07738b75a..6a47e9f55 100755 --- a/tests/bp2build_bazel_test.sh +++ b/tests/bp2build_bazel_test.sh @@ -61,7 +61,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) } function test_different_absolute_outdir { @@ -81,7 +81,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) } function _bp2build_generates_all_buildfiles { @@ -138,7 +138,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-opt/bin/foo/convertible_soong_module/the_answer.txt" if [[ ! -f "${the_answer_file}" ]]; then @@ -185,10 +185,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 @@ -199,7 +199,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 |