Do not modules in files called "Blueprints".

The only case for this was Blueprint itself at build/blueprint, but with
that being a part of Soong, this special case is not necessary anymore.

Test: Presubmits.
Change-Id: Icc51cd80bd43f936a97018061cfbf76fc385e4c3
This commit is contained in:
Lukacs T. Berki
2021-09-02 11:46:24 +02:00
parent 7686708a43
commit b838b0a147
9 changed files with 171 additions and 174 deletions

View File

@@ -15,15 +15,16 @@
package build
import (
"android/soong/finder"
"android/soong/finder/fs"
"android/soong/ui/logger"
"bytes"
"io/ioutil"
"os"
"path/filepath"
"strings"
"android/soong/finder"
"android/soong/finder/fs"
"android/soong/ui/logger"
"android/soong/ui/metrics"
)
@@ -72,8 +73,6 @@ func NewSourceFinder(ctx Context, config Config) (f *finder.Finder) {
"AndroidProducts.mk",
// General Soong build definitions, using the Blueprint syntax.
"Android.bp",
// build/blueprint build definitions, using the Blueprint syntax.
"Blueprints",
// Bazel build definitions.
"BUILD.bazel",
// Bazel build definitions.
@@ -165,8 +164,6 @@ func FindSources(ctx Context, config Config, f *finder.Finder) {
// Recursively look for all Android.bp files
androidBps := f.FindNamedAt(".", "Android.bp")
// The files are named "Blueprints" only in the build/blueprint directory.
androidBps = append(androidBps, f.FindNamedAt("build/blueprint", "Blueprints")...)
if len(androidBps) == 0 {
ctx.Fatalf("No Android.bp found")
}