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

Update tests to use --config=android.

Browse Source 
Bug: 244766775
Test: presubmits
Change-Id: Iaaabd275356c24b3e3713ea1047c134271c4561e
This commit is contained in:
Jingwen Chen
2022-09-07 11:03:33 +00:00
parent 9be110d151
commit 60d8840f65
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/apex_comparison_tests.sh
View File

@@ -60,7 +60,8 @@ build/soong/soong_ui.bash --make-mode BP2BUILD_VERBOSE=1 --skip-soong-tests bp2b
BAZEL_OUT="$(call_bazel info output_path)" BAZEL_OUT="$(call_bazel info output_path)"
call_bazel build --config=bp2build --config=ci --config=android_arm \ export TARGET_PRODUCT="module_arm"
call_bazel build --config=bp2build --config=ci --config=android \
//packages/modules/adb/apex:com.android.adbd \ //packages/modules/adb/apex:com.android.adbd \
//system/timezone/apex:com.android.tzdata \ //system/timezone/apex:com.android.tzdata \
//build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal.apex //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal.apex
@@ -86,7 +87,7 @@ function compare_deapexer_list() {
# Compare the outputs of `deapexer list`, which lists the contents of the apex filesystem image. # Compare the outputs of `deapexer list`, which lists the contents of the apex filesystem image.
local SOONG_APEX="$SOONG_OUTPUT_DIR/$APEX" local SOONG_APEX="$SOONG_OUTPUT_DIR/$APEX"
local BAZEL_APEX="$BAZEL_OUT/android_arm-fastbuild/bin/$APEX_DIR/$APEX" local BAZEL_APEX="$BAZEL_OUT/android_target-fastbuild/bin/$APEX_DIR/$APEX"
local SOONG_LIST="$OUTPUT_DIR/soong.list" local SOONG_LIST="$OUTPUT_DIR/soong.list"
local BAZEL_LIST="$OUTPUT_DIR/bazel.list" local BAZEL_LIST="$OUTPUT_DIR/bazel.list"

8
tests/bp2build_bazel_test.sh
View File

@@ -103,7 +103,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 --package_path=out/soong/workspace //foo/... run_bazel build --config=android --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/android_target-fastbuild/bin/foo/convertible_soong_module/the_answer.txt"
if [[ ! -f "${the_answer_file}" ]]; then if [[ ! -f "${the_answer_file}" ]]; then
@@ -146,10 +146,10 @@ EOF
run_soong bp2build run_soong bp2build
run_bazel build --package_path=out/soong/workspace //a:qq run_bazel build --config=android --package_path=out/soong/workspace //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 --package_path=out/soong/workspace //a:qq run_bazel build --config=android --package_path=out/soong/workspace //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
@@ -160,7 +160,7 @@ EOF
#define QQ 2 #define QQ 2
EOF EOF
run_bazel build --package_path=out/soong/workspace //a:qq run_bazel build --config=android --package_path=out/soong/workspace //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