tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show error message when Android.mk files are found in directories in the deny list.

Browse source 
Bug: 318567881
Test: CIs
Test: add a Android.mk file in a blocked directory(e.g. cts/) and 'm nothing', an error message should be displayed and build process is stopped.
Change-Id: I3e1f63a13a20f77576b0e7424304a661f144df53
This commit is contained in:
Wei Li 2024-02-06 11:54:55 -08:00
parent 7870d329a5
commit d0a2e324df
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/build/androidmk_denylist.go
View file

@ -16,8 +16,6 @@ package build
import (
"strings"
"android/soong/android"
)
var androidmk_denylist []string = []string{
@ -35,13 +33,13 @@ var androidmk_denylist []string = []string{
"toolchain/",
}
func blockAndroidMks(androidMks []string) []string {
return android.FilterListPred(androidMks, func(s string) bool {
func blockAndroidMks(ctx Context, androidMks []string) {
for _, mkFile := range androidMks {
for _, d := range androidmk_denylist {
if strings.HasPrefix(s, d) {
return false
if strings.HasPrefix(mkFile, d) {
ctx.Fatalf("Found blocked Android.mk file: %s. "+
"Please see androidmk_denylist.go for the blocked directories and contact build system team if the file should not be blocked.", mkFile)
}
}
return true
})
}
}

2
ui/build/finder.go
View file

@ -128,7 +128,7 @@ func FindSources(ctx Context, config Config, f *finder.Finder) {
// Stop searching a subdirectory recursively after finding an Android.mk.
androidMks := f.FindFirstNamedAt(".", "Android.mk")
androidMks = blockAndroidMks(androidMks)
blockAndroidMks(ctx, androidMks)
err := dumpListToFile(ctx, config, androidMks, filepath.Join(dumpDir, "Android.mk.list"))
if err != nil {
ctx.Fatalf("Could not export module list: %v", err)