Prepare for ignoring Android.mk files in art/
Bug: 388015096
Test: m nothing
Change-Id: Ia821507c22dd0949e0f8427c962f8fcb53f6b2e4
diff --git a/ui/build/androidmk_denylist.go b/ui/build/androidmk_denylist.go
index 6f57cb1..640a82d 100644
--- a/ui/build/androidmk_denylist.go
+++ b/ui/build/androidmk_denylist.go
@@ -85,10 +85,18 @@
"external/webp/",
}
-func ignoreNdkAndroidMks(androidMks []string) (filtered []string) {
- filter := func(s string) bool {
- for _, d := range external_ndk_androidmks {
- if strings.HasPrefix(s, d) {
+var art_androidmks = []string{
+ //"art/",
+}
+
+func ignoreSomeAndroidMks(androidMks []string) (filtered []string) {
+ ignore_androidmks := make([]string, 0, len(external_ndk_androidmks)+len(art_androidmks))
+ ignore_androidmks = append(ignore_androidmks, external_ndk_androidmks...)
+ ignore_androidmks = append(ignore_androidmks, art_androidmks...)
+
+ shouldKeep := func(androidmk string) bool {
+ for _, prefix := range ignore_androidmks {
+ if strings.HasPrefix(androidmk, prefix) {
return false
}
}
@@ -96,10 +104,9 @@
}
for _, l := range androidMks {
- if filter(l) {
+ if shouldKeep(l) {
filtered = append(filtered, l)
}
}
-
return
}
diff --git a/ui/build/finder.go b/ui/build/finder.go
index da7f255..783b488 100644
--- a/ui/build/finder.go
+++ b/ui/build/finder.go
@@ -128,7 +128,7 @@
// Stop searching a subdirectory recursively after finding an Android.mk.
androidMks := f.FindFirstNamedAt(".", "Android.mk")
- androidMks = ignoreNdkAndroidMks(androidMks)
+ androidMks = ignoreSomeAndroidMks(androidMks)
blockAndroidMks(ctx, androidMks)
err := dumpListToFile(ctx, config, androidMks, filepath.Join(dumpDir, "Android.mk.list"))
if err != nil {