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

Merge "Exempt prebuilts/jdk and build/bazel/examples/java BUILD files from bp2build overwriting" am: d9eb0f0aa6 am: c1493b5af8 am: f54a01bdd3

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

Change-Id: I97b41f8a83f6ddc67a9b2988a7655e7997307cde
This commit is contained in:
Romain Jobredeaux
2021-08-10 16:55:03 +00:00
committed by Automerger Merge Worker
parent ad02ec61fc f54a01bdd3
commit 88eb44b22d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/bazel.go
View File

@@ -137,6 +137,7 @@ var (
// build/bazel explicitly.
"build/bazel":/* recursive = */ false,
"build/bazel/examples/android_app":/* recursive = */ true,
"build/bazel/examples/java":/* recursive = */ true,
"build/bazel/bazel_skylib":/* recursive = */ true,
"build/bazel/rules":/* recursive = */ true,
"build/bazel/rules_cc":/* recursive = */ true,
@@ -149,6 +150,7 @@ var (
// e.g. ERROR: Analysis of target '@soong_injection//mixed_builds:buildroot' failed
"external/bazelbuild-rules_android":/* recursive = */ true,
"prebuilts/jdk":/* recursive = */ true,
"prebuilts/sdk":/* recursive = */ false,
"prebuilts/sdk/tools":/* recursive = */ false,
"prebuilts/r8":/* recursive = */ false,