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

Merge "Revert "Exclude prebuilts/clang/host/linux-x86/clang-dev/BUILD from the symlink forest."" am: 305f5c8dc6

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

Change-Id: I1177af19061eb61d610a544147844e7ab54e38f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yabin Cui
2023-06-28 17:15:42 +00:00
committed by Automerger Merge Worker
parent fb9a124921 305f5c8dc6
commit b6ebc505b2
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/soong_build/main.go
View File

@@ -725,18 +725,6 @@ func excludedFromSymlinkForest(ctx *android.Context, verbose bool) []string {
// FIXME: 'frameworks/compile/slang' has a filegroup error due to an escaping issue // FIXME: 'frameworks/compile/slang' has a filegroup error due to an escaping issue
"frameworks/compile/slang", "frameworks/compile/slang",
// FIXME(b/260809113): 'prebuilts/clang/host/linux-x86/clang-dev' is a tool-generated symlink
// directory that contains a BUILD file. The bazel files finder code doesn't traverse into symlink dirs,
// and hence is not aware of this BUILD file and exclude it accordingly during symlink forest generation
// when checking against keepExistingBuildFiles allowlist.
//
// This is necessary because globs in //prebuilts/clang/host/linux-x86/BUILD
// currently assume no subpackages (keepExistingBuildFile is not recursive for that directory).
//
// This is a bandaid until we the symlink forest logic can intelligently exclude BUILD files found in
// source symlink dirs according to the keepExistingBuildFile allowlist.
"prebuilts/clang/host/linux-x86/clang-dev",
) )
return excluded return excluded
} }