From 4f79359d807baf932659569c628db153866ae835 Mon Sep 17 00:00:00 2001 From: Vinh Tran Date: Mon, 21 Aug 2023 13:25:49 -0400 Subject: [PATCH 1/2] Add bazelbuild-rules_cc to soong_integration_tests This fixes breakage currently on CI. Bug: 296628826 Test: build/soong/tests/bp2build_bazel_test.sh Change-Id: Ibfcd2bc5d2b107879281075ab994f1e9a8f5da0e --- tests/lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/lib.sh b/tests/lib.sh index f3db76f8b..c0b151430 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -154,6 +154,7 @@ function create_mock_bazel { symlink_directory external/bazelbuild-rules_go symlink_directory external/bazelbuild-rules_license symlink_directory external/bazelbuild-kotlin-rules + symlink_directory external/bazelbuild-rules_cc symlink_directory external/bazelbuild-rules_python symlink_directory external/bazelbuild-rules_java From d007cead3f6ee1f97f5b72153ef2e8ddeec3aeef Mon Sep 17 00:00:00 2001 From: Vinh Tran Date: Mon, 21 Aug 2023 13:29:51 -0400 Subject: [PATCH 2/2] Add bazelbuild-rules_rust and tinyjson to soong_integration_tests aosp/2709668 registers Bazel repos using these directories so we need to symlink them for soong integration tests to pass. Test: build/soong/tests/bp2build_bazel_test.sh Change-Id: I8ee7e5c702bd0bfa24eb3778371f497a67bf815a --- tests/lib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/lib.sh b/tests/lib.sh index c0b151430..0766d85bd 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -157,6 +157,8 @@ function create_mock_bazel { symlink_directory external/bazelbuild-rules_cc symlink_directory external/bazelbuild-rules_python symlink_directory external/bazelbuild-rules_java + symlink_directory external/bazelbuild-rules_rust + symlink_directory external/rust/crates/tinyjson symlink_file WORKSPACE symlink_file BUILD