diff options
| author | 2023-06-22 23:54:44 +0000 | |
|---|---|---|
| committer | 2023-06-22 23:54:44 +0000 | |
| commit | 896c6b09dcdb60d12dd2e175a61616a99de7968b (patch) | |
| tree | 936bf7b48f3b47437abed3992b503325ee2f073d | |
| parent | 313d32f730f37d188658b1f12feb0c81d276940e (diff) | |
| parent | 60133b3070fa8069553300c54c5a4fe0a59746a3 (diff) | |
Merge changes from topic "rules_go_repo"
* changes:
Symlink external/bazelbuild-rules_go in mock tests
Always use the BUILD files from bazelbuild-rules_go
| -rw-r--r-- | android/allowlists/allowlists.go | 1 | ||||
| -rw-r--r-- | tests/lib.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 34a6860e9..4a7c92521 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, 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 |