From 916322541ade9e8f583100e2d08d1369f9eef1bd Mon Sep 17 00:00:00 2001
From: Jingwen Chen <jingwen@google.com>
Date: Tue, 10 Aug 2021 13:00:33 +0000
Subject: [PATCH] Allow //external/bazel-skylib to use existing BUILD files

Bug: 190605804
Test: bp2build-incremental
Change-Id: Ida765465532c0e98d035eef4c703d13fbf554538
---
 android/bazel.go | 1 +
 tests/lib.sh     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/android/bazel.go b/android/bazel.go
index 6942d57ca..8c86a9502 100644
--- 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,
diff --git a/tests/lib.sh b/tests/lib.sh
index 1d9b8d423..813a9dd7d 100644
--- 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