StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791908

Change-Id: I74ce53fac43ae8def031a69b56c8fd346bc6a05f
This commit is contained in:
Treehugger Robot
2021-08-11 15:12:30 +00:00
committed by Automerger Merge Worker
parent 3dc9d726ed 00caefe11e
commit 3cdfd5c77e
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/bazel.go
View File

@@ -149,6 +149,7 @@ var (
// external/bazelbuild-rules_android/... is needed by mixed builds, otherwise mixed builds analysis fails // 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 // e.g. ERROR: Analysis of target '@soong_injection//mixed_builds:buildroot' failed
"external/bazelbuild-rules_android":/* recursive = */ true, "external/bazelbuild-rules_android":/* recursive = */ true,
"external/bazel-skylib":/* recursive = */ true,
"prebuilts/jdk":/* recursive = */ true, "prebuilts/jdk":/* recursive = */ true,
"prebuilts/sdk":/* recursive = */ false, "prebuilts/sdk":/* recursive = */ false,

1
tests/lib.sh
View File

@@ -113,6 +113,7 @@ function create_mock_bazel() {
symlink_directory prebuilts/bazel symlink_directory prebuilts/bazel
symlink_directory prebuilts/jdk symlink_directory prebuilts/jdk
symlink_directory external/bazel-skylib
symlink_file WORKSPACE symlink_file WORKSPACE
symlink_file BUILD symlink_file BUILD