diff options
| -rwxr-xr-x | tests/apex_comparison_tests.sh | 5 | ||||
| -rwxr-xr-x | tests/bp2build_bazel_test.sh | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/apex_comparison_tests.sh b/tests/apex_comparison_tests.sh index ac3c177ba..6bc0165b7 100755 --- a/tests/apex_comparison_tests.sh +++ b/tests/apex_comparison_tests.sh @@ -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)" -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 \ //system/timezone/apex:com.android.tzdata \ //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. 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 BAZEL_LIST="$OUTPUT_DIR/bazel.list" diff --git a/tests/bp2build_bazel_test.sh b/tests/bp2build_bazel_test.sh index 3cdf6aa36..78af54d4a 100755 --- a/tests/bp2build_bazel_test.sh +++ b/tests/bp2build_bazel_test.sh @@ -103,7 +103,7 @@ EOF fi # 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" if [[ ! -f "${the_answer_file}" ]]; then @@ -146,10 +146,10 @@ EOF 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) - 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) if [[ "$output_mtime1" != "$output_mtime2" ]]; then @@ -160,7 +160,7 @@ EOF #define QQ 2 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) if [[ "$output_mtime1" == "$output_mtime3" ]]; then |