Merge "Allow //external/bazel-skylib to use existing BUILD files" am: 00caefe11e

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791908 Change-Id: I74ce53fac43ae8def031a69b56c8fd346bc6a05f
2021-08-11 15:12:30 +00:00
parent 3dc9d726ed 00caefe11e
commit 3cdfd5c77e
2 changed files with 2 additions and 0 deletions
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -149,6 +149,7 @@ var (
 		// external/bazelbuild-rules_android/... is needed by mixed builds, otherwise mixed builds analysis fails
 		// e.g. ERROR: Analysis of target '@soong_injection//mixed_builds:buildroot' failed
 		"external/bazelbuild-rules_android":/* recursive = */ true,
+		"external/bazel-skylib":/* recursive = */ true,

 		"prebuilts/jdk":/* recursive = */ true,
 		"prebuilts/sdk":/* recursive = */ false,
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -113,6 +113,7 @@ function create_mock_bazel() {

  symlink_directory prebuilts/bazel
  symlink_directory prebuilts/jdk
+  symlink_directory external/bazel-skylib

  symlink_file WORKSPACE
  symlink_file BUILD