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

Commit c5288af9 authored by Joe Onorato's avatar Joe Onorato
Browse files

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
parent 130cbf6f

ui/build/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ bootstrap_go_package { 
        "blueprint",

        "blueprint-bootstrap",

        "blueprint-microfactory",

        "soong-android",

        "soong-elf",

        "soong-finder",

        "soong-remoteexec",

ui/build/androidmk_denylist.go

+11 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ package build 


import (

	"strings"



	"android/soong/android"

)



var androidmk_denylist []string = []string{
@@ -82,13 +80,21 @@ var external_ndk_androidmks []string = []string{ 
	"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

}