Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00fdace6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "In the finder, keep track of BUILD files instead of only BUILD.bazel files." am: c6d21226 

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

Change-Id: Ia697a239c9091b8c38621546abae2826ac69641c
parents 274da509 c6d21226

ui/build/finder.go

+3 −1
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ func NewSourceFinder(ctx Context, config Config) (f *finder.Finder) { 
			"Blueprints",

			// Bazel build definitions.

			"BUILD.bazel",

			// Bazel build definitions.

			"BUILD",

			// Kati clean definitions.

			"CleanSpec.mk",

			// Ownership definition.
@@ -102,7 +104,7 @@ func NewSourceFinder(ctx Context, config Config) (f *finder.Finder) { 
func findBazelFiles(entries finder.DirEntries) (dirNames []string, fileNames []string) {

	matches := []string{}

	for _, foundName := range entries.FileNames {

		if foundName == "BUILD.bazel" || foundName == "WORKSPACE" || strings.HasSuffix(foundName, ".bzl") {

		if foundName == "BUILD.bazel" || foundName == "BUILD" || foundName == "WORKSPACE" || strings.HasSuffix(foundName, ".bzl") {

			matches = append(matches, foundName)

		}

	}