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

make android.InList generic

Browse source 
Change-Id: Ic166216cb473371a5e34cd97a068ca35f5534740
This commit is contained in:
Sam Delmerico 2023-07-18 15:07:24 -04:00
parent a56663f695
commit 1717b3bb7a
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/util.go
View file

@ -137,19 +137,17 @@ func SortedUniqueStringValues(m interface{}) []string {
}
// IndexList returns the index of the first occurrence of the given string in the list or -1
func IndexList(s string, list []string) int {
func IndexList[T comparable](t T, list []T) int {
for i, l := range list {
if l == s {
if l == t {
return i
}
}
return -1
}
// InList checks if the string belongs to the list
func InList(s string, list []string) bool {
return IndexList(s, list) != -1
func InList[T comparable](t T, list []T) bool {
return IndexList(t, list) != -1
}
func setFromList[T comparable](l []T) map[T]bool {

2
cc/config/toolchain.go
View file

@ -261,5 +261,3 @@ func LibFuzzerRuntimeLibrary(t Toolchain) string {
func LibFuzzerRuntimeInterceptors(t Toolchain) string {
return LibclangRuntimeLibrary(t, "fuzzer_interceptors")
}
var inList = android.InList

4
cc/util.go
View file

@ -28,8 +28,8 @@ func includeDirsToFlags(dirs android.Paths) string {
return android.JoinWithPrefix(dirs.Strings(), "-I")
}
var indexList = android.IndexList
var inList = android.InList
var indexList = android.IndexList[string]
var inList = android.InList[string]
var filterList = android.FilterList
var removeListFromList = android.RemoveListFromList
var removeFromList = android.RemoveFromList

2
java/java.go
View file

@ -2664,7 +2664,7 @@ func (ks *kytheExtractJavaSingleton) GenerateBuildActions(ctx android.SingletonC
var Bool = proptools.Bool
var BoolDefault = proptools.BoolDefault
var String = proptools.String
var inList = android.InList
var inList = android.InList[string]
// Add class loader context (CLC) of a given dependency to the current CLC.
func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,