Inline android.FilterListPred so soong_ui doesn't depend on the android package
soong-android is for inside soong_build, not the ui.
Bug: 374816306
Test: treehugger
Change-Id: If10e5c29f7caf0df347caa2abc9a9db4c8bfe4a1
diff --git a/ui/build/androidmk_denylist.go b/ui/build/androidmk_denylist.go
index a8044df..c54d55f 100644
--- a/ui/build/androidmk_denylist.go
+++ b/ui/build/androidmk_denylist.go
@@ -16,8 +16,6 @@
import (
"strings"
-
- "android/soong/android"
)
var androidmk_denylist []string = []string{
@@ -82,13 +80,21 @@
"external/webp/",
}
-func ignoreNdkAndroidMks(androidMks []string) []string {
- return android.FilterListPred(androidMks, func(s string) bool {
+func ignoreNdkAndroidMks(androidMks []string) (filtered []string) {
+ filter := func(s string) bool {
for _, d := range external_ndk_androidmks {
if strings.HasPrefix(s, d) {
return false
}
}
return true
- })
+ }
+
+ for _, l := range androidMks {
+ if filter(l) {
+ filtered = append(filtered, l)
+ }
+ }
+
+ return
}