Merge "Allowlist build files in external/python/absl-py" (a6d4e15c) · Commits · e / os / android_build_soong

android/allowlists/allowlists.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -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,

tests/bp2build_bazel_test.sh

+6 −6

Original line number	Diff line number	Diff line
		@@ -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