StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allowlist build files in external/python/absl-py" am: 5d4f066ec9 am: 59e28e489a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2308367

Change-Id: Ie9f33cb39b049ece57609bbe7e6e73f7febd2fd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2022-11-29 20:51:46 +00:00
committed by Automerger Merge Worker
parent 78ff31a6a5 59e28e489a
commit 2db7d85bcd
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/allowlists/allowlists.go
View File

@@ -364,6 +364,7 @@ var (
"external/guava":/* recursive = */ true, "external/guava":/* recursive = */ true,
"external/jsr305":/* recursive = */ true, "external/jsr305":/* recursive = */ true,
"external/protobuf":/* recursive = */ false, "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/**/*". // this BUILD file is globbed by //external/icu/icu4c/source:icu4c_test_data's "data/**/*".
"external/icu/icu4c/source/data/unidata/norm2":/* recursive = */ false, "external/icu/icu4c/source/data/unidata/norm2":/* recursive = */ false,

12
tests/bp2build_bazel_test.sh
View File

@@ -65,7 +65,7 @@ EOF
outdir=out2 outdir=out2
trap "rm -rf $outdir" EXIT trap "rm -rf $outdir" EXIT
# Modify OUT_DIR in a subshell so it doesn't affect the top level one. # 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 test_different_relative_outdir
@@ -87,7 +87,7 @@ EOF
outdir=$(mktemp -t -d st.XXXXX) outdir=$(mktemp -t -d st.XXXXX)
trap 'rm -rf $outdir' EXIT trap 'rm -rf $outdir' EXIT
# Modify OUT_DIR in a subshell so it doesn't affect the top level one. # 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 test_different_absolute_outdir
@@ -146,7 +146,7 @@ EOF
fi fi
# NOTE: We don't actually use the extra BUILD file for anything here # 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" local the_answer_file="bazel-out/android_target-fastbuild/bin/foo/convertible_soong_module/the_answer.txt"
if [[ ! -f "${the_answer_file}" ]]; then if [[ ! -f "${the_answer_file}" ]]; then
@@ -191,10 +191,10 @@ EOF
run_soong bp2build 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) 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) local -r output_mtime2=$(stat -c "%y" bazel-bin/a/_objs/qq/qq.o)
if [[ "$output_mtime1" != "$output_mtime2" ]]; then if [[ "$output_mtime1" != "$output_mtime2" ]]; then
@@ -205,7 +205,7 @@ EOF
#define QQ 2 #define QQ 2
EOF 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) local -r output_mtime3=$(stat -c "%y" bazel-bin/a/_objs/qq/qq.o)
if [[ "$output_mtime1" == "$output_mtime3" ]]; then if [[ "$output_mtime1" == "$output_mtime3" ]]; then

3
tests/run_integration_tests.sh
View File

@@ -12,4 +12,5 @@ TOP="$(readlink -f "$(dirname "$0")"/../../..)"
# The following tests build against the full source tree and don't rely on the # The following tests build against the full source tree and don't rely on the
# mock client. # mock client.
"$TOP/build/soong/tests/apex_comparison_tests.sh" # TODO(b/260278287) the bazel server won't shut down for some reason when run on the build server
# "$TOP/build/soong/tests/apex_comparison_tests.sh"