From 4a5bc5c587224ce62a8aff92d213b8f768d1bd8e Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 26 Jun 2023 03:44:04 +0000 Subject: [PATCH 1/2] Revert^2 "Always use the BUILD files from bazelbuild-rules_go" 51eee74a0216ceb45d9e7aa8d537bd85aa59ba88 Change-Id: I86f2d4bb1e336c72a9c89e67598db8a1bdea6a2c --- android/allowlists/allowlists.go | 1 + 1 file changed, 1 insertion(+) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index af97325e4..12e583c77 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -429,6 +429,7 @@ var ( // e.g. ERROR: Analysis of target '@soong_injection//mixed_builds:buildroot' failed "external/bazelbuild-rules_android":/* recursive = */ true, "external/bazelbuild-rules_license":/* recursive = */ true, + "external/bazelbuild-rules_go":/* recursive = */ true, "external/bazelbuild-kotlin-rules":/* recursive = */ true, "external/bazel-skylib":/* recursive = */ true, "external/protobuf":/* recursive = */ false, From f7373e62dcd6d6de62ef52de3b73306887240e5f Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 26 Jun 2023 03:44:04 +0000 Subject: [PATCH 2/2] Revert^2 "Symlink external/bazelbuild-rules_go in mock tests" 5479e0f202c6c045831d082f67a6fc723ff328ff Change-Id: Idc4baa3d8afd1841ee3620e2f2e29a30c85a5473 --- tests/lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/lib.sh b/tests/lib.sh index b5dea992c..4aaf272a7 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -144,6 +144,7 @@ function create_mock_bazel { symlink_directory prebuilts/jdk symlink_directory external/bazel-skylib symlink_directory external/bazelbuild-rules_android + symlink_directory external/bazelbuild-rules_go symlink_directory external/bazelbuild-rules_license symlink_directory external/bazelbuild-kotlin-rules